Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
6b374192
提交
6b374192
authored
11月 26, 2015
作者:
Sergi Vladykin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #211 from svladykin/batchview2
Batched index lookups for sub-query
上级
ffc00f89
b02a17af
全部展开
显示空白字符变更
内嵌
并排
正在显示
23 个修改的文件
包含
1670 行增加
和
700 行删除
+1670
-700
Command.java
h2/src/main/org/h2/command/Command.java
+5
-0
CommandContainer.java
h2/src/main/org/h2/command/CommandContainer.java
+20
-0
CommandList.java
h2/src/main/org/h2/command/CommandList.java
+5
-0
AlterTableAddConstraint.java
h2/src/main/org/h2/command/ddl/AlterTableAddConstraint.java
+6
-0
Explain.java
h2/src/main/org/h2/command/dml/Explain.java
+4
-0
NoOperation.java
h2/src/main/org/h2/command/dml/NoOperation.java
+0
-5
Query.java
h2/src/main/org/h2/command/dml/Query.java
+12
-0
Select.java
h2/src/main/org/h2/command/dml/Select.java
+30
-1
SelectUnion.java
h2/src/main/org/h2/command/dml/SelectUnion.java
+11
-1
Set.java
h2/src/main/org/h2/command/dml/Set.java
+9
-0
SetTypes.java
h2/src/main/org/h2/command/dml/SetTypes.java
+6
-0
Session.java
h2/src/main/org/h2/engine/Session.java
+19
-2
IndexLookupBatch.java
h2/src/main/org/h2/index/IndexLookupBatch.java
+17
-2
MultiVersionIndex.java
h2/src/main/org/h2/index/MultiVersionIndex.java
+0
-2
ViewCursor.java
h2/src/main/org/h2/index/ViewCursor.java
+1
-1
ViewIndex.java
h2/src/main/org/h2/index/ViewIndex.java
+70
-50
JoinBatch.java
h2/src/main/org/h2/table/JoinBatch.java
+1044
-0
SubQueryInfo.java
h2/src/main/org/h2/table/SubQueryInfo.java
+1
-9
Table.java
h2/src/main/org/h2/table/Table.java
+4
-0
TableFilter.java
h2/src/main/org/h2/table/TableFilter.java
+107
-621
TableView.java
h2/src/main/org/h2/table/TableView.java
+5
-0
LazyFuture.java
h2/src/main/org/h2/util/LazyFuture.java
+106
-0
TestTableEngines.java
h2/src/test/org/h2/test/db/TestTableEngines.java
+188
-6
没有找到文件。
h2/src/main/org/h2/command/Command.java
浏览文件 @
6b374192
...
@@ -68,6 +68,11 @@ public abstract class Command implements CommandInterface {
...
@@ -68,6 +68,11 @@ public abstract class Command implements CommandInterface {
@Override
@Override
public
abstract
boolean
isQuery
();
public
abstract
boolean
isQuery
();
/**
* Prepare join batching.
*/
public
abstract
void
prepareJoinBatch
();
/**
/**
* Get the list of parameters.
* Get the list of parameters.
*
*
...
...
h2/src/main/org/h2/command/CommandContainer.java
浏览文件 @
6b374192
...
@@ -7,6 +7,8 @@ package org.h2.command;
...
@@ -7,6 +7,8 @@ package org.h2.command;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
org.h2.api.DatabaseEventListener
;
import
org.h2.api.DatabaseEventListener
;
import
org.h2.command.dml.Explain
;
import
org.h2.command.dml.Query
;
import
org.h2.expression.Parameter
;
import
org.h2.expression.Parameter
;
import
org.h2.expression.ParameterInterface
;
import
org.h2.expression.ParameterInterface
;
import
org.h2.result.ResultInterface
;
import
org.h2.result.ResultInterface
;
...
@@ -44,6 +46,23 @@ public class CommandContainer extends Command {
...
@@ -44,6 +46,23 @@ public class CommandContainer extends Command {
return
prepared
.
isQuery
();
return
prepared
.
isQuery
();
}
}
@Override
public
void
prepareJoinBatch
()
{
if
(
session
.
isJoinBatchEnabled
())
{
prepareJoinBatch
(
prepared
);
}
}
private
static
void
prepareJoinBatch
(
Prepared
prepared
)
{
if
(
prepared
.
isQuery
())
{
if
(
prepared
.
getType
()
==
CommandInterface
.
SELECT
)
{
((
Query
)
prepared
).
prepareJoinBatch
();
}
else
if
(
prepared
.
getType
()
==
CommandInterface
.
EXPLAIN
)
{
prepareJoinBatch
(((
Explain
)
prepared
).
getCommand
());
}
}
}
private
void
recompileIfRequired
()
{
private
void
recompileIfRequired
()
{
if
(
prepared
.
needRecompile
())
{
if
(
prepared
.
needRecompile
())
{
// TODO test with 'always recompile'
// TODO test with 'always recompile'
...
@@ -65,6 +84,7 @@ public class CommandContainer extends Command {
...
@@ -65,6 +84,7 @@ public class CommandContainer extends Command {
}
}
prepared
.
prepare
();
prepared
.
prepare
();
prepared
.
setModificationMetaId
(
mod
);
prepared
.
setModificationMetaId
(
mod
);
prepareJoinBatch
();
}
}
}
}
...
...
h2/src/main/org/h2/command/CommandList.java
浏览文件 @
6b374192
...
@@ -44,6 +44,11 @@ class CommandList extends Command {
...
@@ -44,6 +44,11 @@ class CommandList extends Command {
return
updateCount
;
return
updateCount
;
}
}
@Override
public
void
prepareJoinBatch
()
{
command
.
prepareJoinBatch
();
}
@Override
@Override
public
ResultInterface
query
(
int
maxrows
)
{
public
ResultInterface
query
(
int
maxrows
)
{
ResultInterface
result
=
command
.
query
(
maxrows
);
ResultInterface
result
=
command
.
query
(
maxrows
);
...
...
h2/src/main/org/h2/command/ddl/AlterTableAddConstraint.java
浏览文件 @
6b374192
...
@@ -294,6 +294,9 @@ public class AlterTableAddConstraint extends SchemaCommand {
...
@@ -294,6 +294,9 @@ public class AlterTableAddConstraint extends SchemaCommand {
}
}
private
static
Index
getUniqueIndex
(
Table
t
,
IndexColumn
[]
cols
)
{
private
static
Index
getUniqueIndex
(
Table
t
,
IndexColumn
[]
cols
)
{
if
(
t
.
getIndexes
()
==
null
)
{
return
null
;
}
for
(
Index
idx
:
t
.
getIndexes
())
{
for
(
Index
idx
:
t
.
getIndexes
())
{
if
(
canUseUniqueIndex
(
idx
,
t
,
cols
))
{
if
(
canUseUniqueIndex
(
idx
,
t
,
cols
))
{
return
idx
;
return
idx
;
...
@@ -303,6 +306,9 @@ public class AlterTableAddConstraint extends SchemaCommand {
...
@@ -303,6 +306,9 @@ public class AlterTableAddConstraint extends SchemaCommand {
}
}
private
static
Index
getIndex
(
Table
t
,
IndexColumn
[]
cols
,
boolean
moreColumnOk
)
{
private
static
Index
getIndex
(
Table
t
,
IndexColumn
[]
cols
,
boolean
moreColumnOk
)
{
if
(
t
.
getIndexes
()
==
null
)
{
return
null
;
}
for
(
Index
idx
:
t
.
getIndexes
())
{
for
(
Index
idx
:
t
.
getIndexes
())
{
if
(
canUseIndex
(
idx
,
t
,
cols
,
moreColumnOk
))
{
if
(
canUseIndex
(
idx
,
t
,
cols
,
moreColumnOk
))
{
return
idx
;
return
idx
;
...
...
h2/src/main/org/h2/command/dml/Explain.java
浏览文件 @
6b374192
...
@@ -40,6 +40,10 @@ public class Explain extends Prepared {
...
@@ -40,6 +40,10 @@ public class Explain extends Prepared {
this
.
command
=
command
;
this
.
command
=
command
;
}
}
public
Prepared
getCommand
()
{
return
command
;
}
@Override
@Override
public
void
prepare
()
{
public
void
prepare
()
{
command
.
prepare
();
command
.
prepare
();
...
...
h2/src/main/org/h2/command/dml/NoOperation.java
浏览文件 @
6b374192
...
@@ -24,11 +24,6 @@ public class NoOperation extends Prepared {
...
@@ -24,11 +24,6 @@ public class NoOperation extends Prepared {
return
0
;
return
0
;
}
}
@Override
public
boolean
isQuery
()
{
return
false
;
}
@Override
@Override
public
boolean
isTransactional
()
{
public
boolean
isTransactional
()
{
return
true
;
return
true
;
...
...
h2/src/main/org/h2/command/dml/Query.java
浏览文件 @
6b374192
...
@@ -71,6 +71,18 @@ public abstract class Query extends Prepared {
...
@@ -71,6 +71,18 @@ public abstract class Query extends Prepared {
super
(
session
);
super
(
session
);
}
}
/**
* Check if this is a UNION query.
*
* @return {@code true} if this is a UNION query
*/
public
abstract
boolean
isUnion
();
/**
* Prepare join batching.
*/
public
abstract
void
prepareJoinBatch
();
/**
/**
* Execute the query without checking the cache. If a target is specified,
* Execute the query without checking the cache. If a target is specified,
* the results are written to it, and the method returns null. If no target
* the results are written to it, and the method returns null. If no target
...
...
h2/src/main/org/h2/command/dml/Select.java
浏览文件 @
6b374192
...
@@ -9,7 +9,6 @@ import java.util.ArrayList;
...
@@ -9,7 +9,6 @@ import java.util.ArrayList;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.HashSet
;
import
java.util.HashSet
;
import
org.h2.api.ErrorCode
;
import
org.h2.api.ErrorCode
;
import
org.h2.api.Trigger
;
import
org.h2.api.Trigger
;
import
org.h2.command.CommandInterface
;
import
org.h2.command.CommandInterface
;
...
@@ -36,6 +35,7 @@ import org.h2.result.SortOrder;
...
@@ -36,6 +35,7 @@ import org.h2.result.SortOrder;
import
org.h2.table.Column
;
import
org.h2.table.Column
;
import
org.h2.table.ColumnResolver
;
import
org.h2.table.ColumnResolver
;
import
org.h2.table.IndexColumn
;
import
org.h2.table.IndexColumn
;
import
org.h2.table.JoinBatch
;
import
org.h2.table.Table
;
import
org.h2.table.Table
;
import
org.h2.table.TableFilter
;
import
org.h2.table.TableFilter
;
import
org.h2.util.New
;
import
org.h2.util.New
;
...
@@ -87,6 +87,11 @@ public class Select extends Query {
...
@@ -87,6 +87,11 @@ public class Select extends Query {
super
(
session
);
super
(
session
);
}
}
@Override
public
boolean
isUnion
()
{
return
false
;
}
/**
/**
* Add a table to the query.
* Add a table to the query.
*
*
...
@@ -945,6 +950,30 @@ public class Select extends Query {
...
@@ -945,6 +950,30 @@ public class Select extends Query {
isPrepared
=
true
;
isPrepared
=
true
;
}
}
@Override
public
void
prepareJoinBatch
()
{
ArrayList
<
TableFilter
>
list
=
New
.
arrayList
();
TableFilter
f
=
getTopTableFilter
();
do
{
if
(
f
.
getNestedJoin
()
!=
null
)
{
// we do not support batching with nested joins
return
;
}
list
.
add
(
f
);
f
=
f
.
getJoin
();
}
while
(
f
!=
null
);
TableFilter
[]
fs
=
list
.
toArray
(
new
TableFilter
[
list
.
size
()]);
// prepare join batch
JoinBatch
jb
=
null
;
for
(
int
i
=
fs
.
length
-
1
;
i
>=
0
;
i
--)
{
jb
=
fs
[
i
].
prepareJoinBatch
(
jb
,
fs
,
i
);
}
}
public
JoinBatch
getJoinBatch
()
{
return
getTopTableFilter
().
getJoinBatch
();
}
@Override
@Override
public
double
getCost
()
{
public
double
getCost
()
{
return
cost
;
return
cost
;
...
...
h2/src/main/org/h2/command/dml/SelectUnion.java
浏览文件 @
6b374192
...
@@ -7,7 +7,6 @@ package org.h2.command.dml;
...
@@ -7,7 +7,6 @@ package org.h2.command.dml;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.HashSet
;
import
java.util.HashSet
;
import
org.h2.api.ErrorCode
;
import
org.h2.api.ErrorCode
;
import
org.h2.command.CommandInterface
;
import
org.h2.command.CommandInterface
;
import
org.h2.engine.Session
;
import
org.h2.engine.Session
;
...
@@ -72,6 +71,17 @@ public class SelectUnion extends Query {
...
@@ -72,6 +71,17 @@ public class SelectUnion extends Query {
this
.
left
=
query
;
this
.
left
=
query
;
}
}
@Override
public
boolean
isUnion
()
{
return
true
;
}
@Override
public
void
prepareJoinBatch
()
{
left
.
prepareJoinBatch
();
right
.
prepareJoinBatch
();
}
public
void
setUnionType
(
int
type
)
{
public
void
setUnionType
(
int
type
)
{
this
.
unionType
=
type
;
this
.
unionType
=
type
;
}
}
...
...
h2/src/main/org/h2/command/dml/Set.java
浏览文件 @
6b374192
...
@@ -497,6 +497,15 @@ public class Set extends Prepared {
...
@@ -497,6 +497,15 @@ public class Set extends Prepared {
database
.
setRowFactory
(
rowFactory
);
database
.
setRowFactory
(
rowFactory
);
break
;
break
;
}
}
case
SetTypes
.
BATCH_JOINS
:
{
int
value
=
getIntValue
();
if
(
value
!=
0
&&
value
!=
1
)
{
throw
DbException
.
getInvalidValueException
(
"BATCH_JOINS"
,
getIntValue
());
}
session
.
setJoinBatchEnabled
(
value
==
1
);
break
;
}
default
:
default
:
DbException
.
throwInternalError
(
"type="
+
type
);
DbException
.
throwInternalError
(
"type="
+
type
);
}
}
...
...
h2/src/main/org/h2/command/dml/SetTypes.java
浏览文件 @
6b374192
...
@@ -228,6 +228,11 @@ public class SetTypes {
...
@@ -228,6 +228,11 @@ public class SetTypes {
*/
*/
public
static
final
int
ROW_FACTORY
=
43
;
public
static
final
int
ROW_FACTORY
=
43
;
/**
* The type of SET BATCH_JOINS statement.
*/
public
static
final
int
BATCH_JOINS
=
44
;
private
static
final
ArrayList
<
String
>
TYPES
=
New
.
arrayList
();
private
static
final
ArrayList
<
String
>
TYPES
=
New
.
arrayList
();
private
SetTypes
()
{
private
SetTypes
()
{
...
@@ -280,6 +285,7 @@ public class SetTypes {
...
@@ -280,6 +285,7 @@ public class SetTypes {
list
.
add
(
QUERY_STATISTICS
,
"QUERY_STATISTICS"
);
list
.
add
(
QUERY_STATISTICS
,
"QUERY_STATISTICS"
);
list
.
add
(
QUERY_STATISTICS_MAX_ENTRIES
,
"QUERY_STATISTICS_MAX_ENTRIES"
);
list
.
add
(
QUERY_STATISTICS_MAX_ENTRIES
,
"QUERY_STATISTICS_MAX_ENTRIES"
);
list
.
add
(
ROW_FACTORY
,
"ROW_FACTORY"
);
list
.
add
(
ROW_FACTORY
,
"ROW_FACTORY"
);
list
.
add
(
BATCH_JOINS
,
"BATCH_JOINS"
);
}
}
/**
/**
...
...
h2/src/main/org/h2/engine/Session.java
浏览文件 @
6b374192
...
@@ -30,12 +30,14 @@ import org.h2.mvstore.db.TransactionStore.Change;
...
@@ -30,12 +30,14 @@ import org.h2.mvstore.db.TransactionStore.Change;
import
org.h2.mvstore.db.TransactionStore.Transaction
;
import
org.h2.mvstore.db.TransactionStore.Transaction
;
import
org.h2.result.LocalResult
;
import
org.h2.result.LocalResult
;
import
org.h2.result.Row
;
import
org.h2.result.Row
;
import
org.h2.result.SortOrder
;
import
org.h2.schema.Schema
;
import
org.h2.schema.Schema
;
import
org.h2.store.DataHandler
;
import
org.h2.store.DataHandler
;
import
org.h2.store.InDoubtTransaction
;
import
org.h2.store.InDoubtTransaction
;
import
org.h2.store.LobStorageFrontend
;
import
org.h2.store.LobStorageFrontend
;
import
org.h2.table.SubQueryInfo
;
import
org.h2.table.SubQueryInfo
;
import
org.h2.table.Table
;
import
org.h2.table.Table
;
import
org.h2.table.TableFilter
;
import
org.h2.util.New
;
import
org.h2.util.New
;
import
org.h2.util.SmallLRUCache
;
import
org.h2.util.SmallLRUCache
;
import
org.h2.value.Value
;
import
org.h2.value.Value
;
...
@@ -115,6 +117,7 @@ public class Session extends SessionWithState {
...
@@ -115,6 +117,7 @@ public class Session extends SessionWithState {
private
int
parsingView
;
private
int
parsingView
;
private
volatile
SmallLRUCache
<
Object
,
ViewIndex
>
viewIndexCache
;
private
volatile
SmallLRUCache
<
Object
,
ViewIndex
>
viewIndexCache
;
private
HashMap
<
Object
,
ViewIndex
>
subQueryIndexCache
;
private
HashMap
<
Object
,
ViewIndex
>
subQueryIndexCache
;
private
boolean
joinBatchEnabled
;
/**
/**
* Temporary LOBs from result sets. Those are kept for some time. The
* Temporary LOBs from result sets. Those are kept for some time. The
...
@@ -148,12 +151,25 @@ public class Session extends SessionWithState {
...
@@ -148,12 +151,25 @@ public class Session extends SessionWithState {
this
.
currentSchemaName
=
Constants
.
SCHEMA_MAIN
;
this
.
currentSchemaName
=
Constants
.
SCHEMA_MAIN
;
}
}
public
void
setJoinBatchEnabled
(
boolean
joinBatchEnabled
)
{
this
.
joinBatchEnabled
=
joinBatchEnabled
;
}
public
boolean
isJoinBatchEnabled
()
{
return
joinBatchEnabled
;
}
public
Row
createRow
(
Value
[]
data
,
int
memory
)
{
public
Row
createRow
(
Value
[]
data
,
int
memory
)
{
return
database
.
createRow
(
data
,
memory
);
return
database
.
createRow
(
data
,
memory
);
}
}
public
void
setSubQueryInfo
(
SubQueryInfo
subQueryInfo
)
{
public
void
pushSubQueryInfo
(
int
[]
masks
,
TableFilter
[]
filters
,
int
filter
,
this
.
subQueryInfo
=
subQueryInfo
;
SortOrder
sortOrder
)
{
subQueryInfo
=
new
SubQueryInfo
(
subQueryInfo
,
masks
,
filters
,
filter
,
sortOrder
);
}
public
void
popSubQueryInfo
()
{
subQueryInfo
=
subQueryInfo
.
getUpper
();
}
}
public
SubQueryInfo
getSubQueryInfo
()
{
public
SubQueryInfo
getSubQueryInfo
()
{
...
@@ -492,6 +508,7 @@ public class Session extends SessionWithState {
...
@@ -492,6 +508,7 @@ public class Session extends SessionWithState {
// we can't reuse sub-query indexes, so just drop the whole cache
// we can't reuse sub-query indexes, so just drop the whole cache
subQueryIndexCache
=
null
;
subQueryIndexCache
=
null
;
}
}
command
.
prepareJoinBatch
();
if
(
queryCache
!=
null
)
{
if
(
queryCache
!=
null
)
{
if
(
command
.
isCacheable
())
{
if
(
command
.
isCacheable
())
{
queryCache
.
put
(
sql
,
command
);
queryCache
.
put
(
sql
,
command
);
...
...
h2/src/main/org/h2/index/IndexLookupBatch.java
浏览文件 @
6b374192
...
@@ -15,7 +15,8 @@ import org.h2.result.SearchRow;
...
@@ -15,7 +15,8 @@ import org.h2.result.SearchRow;
* method {@link #isBatchFull()}} will return {@code true} or there are no more
* method {@link #isBatchFull()}} will return {@code true} or there are no more
* search rows to add. Then method {@link #find()} will be called to execute batched lookup.
* search rows to add. Then method {@link #find()} will be called to execute batched lookup.
* Note that a single instance of {@link IndexLookupBatch} can be reused for multiple
* Note that a single instance of {@link IndexLookupBatch} can be reused for multiple
* sequential batched lookups.
* sequential batched lookups, moreover it can be reused for multiple queries for
* the same prepared statement.
*
*
* @see Index#createLookupBatch(org.h2.table.TableFilter)
* @see Index#createLookupBatch(org.h2.table.TableFilter)
* @author Sergi Vladykin
* @author Sergi Vladykin
...
@@ -26,9 +27,11 @@ public interface IndexLookupBatch {
...
@@ -26,9 +27,11 @@ public interface IndexLookupBatch {
*
*
* @param first the first row, or null for no limit
* @param first the first row, or null for no limit
* @param last the last row, or null for no limit
* @param last the last row, or null for no limit
* @return {@code false} if this search row pair is known to produce no results
* and thus the given row pair was not added
* @see Index#find(TableFilter, SearchRow, SearchRow)
* @see Index#find(TableFilter, SearchRow, SearchRow)
*/
*/
void
addSearchRows
(
SearchRow
first
,
SearchRow
last
);
boolean
addSearchRows
(
SearchRow
first
,
SearchRow
last
);
/**
/**
* Check if this batch is full.
* Check if this batch is full.
...
@@ -47,4 +50,16 @@ public interface IndexLookupBatch {
...
@@ -47,4 +50,16 @@ public interface IndexLookupBatch {
* @return List of future cursors for collected search rows.
* @return List of future cursors for collected search rows.
*/
*/
List
<
Future
<
Cursor
>>
find
();
List
<
Future
<
Cursor
>>
find
();
/**
* Get plan for EXPLAIN.
*
* @return plan
*/
String
getPlanSQL
();
/**
* Reset this batch to clear state. This method will be called before each query execution.
*/
void
reset
();
}
}
h2/src/main/org/h2/index/MultiVersionIndex.java
浏览文件 @
6b374192
...
@@ -6,8 +6,6 @@
...
@@ -6,8 +6,6 @@
package
org
.
h2
.
index
;
package
org
.
h2
.
index
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.concurrent.Future
;
import
org.h2.api.ErrorCode
;
import
org.h2.api.ErrorCode
;
import
org.h2.engine.Database
;
import
org.h2.engine.Database
;
import
org.h2.engine.DbObject
;
import
org.h2.engine.DbObject
;
...
...
h2/src/main/org/h2/index/ViewCursor.java
浏览文件 @
6b374192
...
@@ -24,7 +24,7 @@ public class ViewCursor implements Cursor {
...
@@ -24,7 +24,7 @@ public class ViewCursor implements Cursor {
private
final
SearchRow
first
,
last
;
private
final
SearchRow
first
,
last
;
private
Row
current
;
private
Row
current
;
ViewCursor
(
ViewIndex
index
,
LocalResult
result
,
SearchRow
first
,
public
ViewCursor
(
ViewIndex
index
,
LocalResult
result
,
SearchRow
first
,
SearchRow
last
)
{
SearchRow
last
)
{
this
.
table
=
index
.
getTable
();
this
.
table
=
index
.
getTable
();
this
.
index
=
index
;
this
.
index
=
index
;
...
...
h2/src/main/org/h2/index/ViewIndex.java
浏览文件 @
6b374192
...
@@ -21,7 +21,7 @@ import org.h2.result.SearchRow;
...
@@ -21,7 +21,7 @@ import org.h2.result.SearchRow;
import
org.h2.result.SortOrder
;
import
org.h2.result.SortOrder
;
import
org.h2.table.Column
;
import
org.h2.table.Column
;
import
org.h2.table.IndexColumn
;
import
org.h2.table.IndexColumn
;
import
org.h2.table.
SubQueryInfo
;
import
org.h2.table.
JoinBatch
;
import
org.h2.table.TableFilter
;
import
org.h2.table.TableFilter
;
import
org.h2.table.TableView
;
import
org.h2.table.TableView
;
import
org.h2.util.IntArray
;
import
org.h2.util.IntArray
;
...
@@ -93,6 +93,15 @@ public class ViewIndex extends BaseIndex implements SpatialIndex {
...
@@ -93,6 +93,15 @@ public class ViewIndex extends BaseIndex implements SpatialIndex {
}
}
}
}
@Override
public
IndexLookupBatch
createLookupBatch
(
TableFilter
filter
)
{
if
(
recursive
)
{
// we do not support batching for recursive queries
return
null
;
}
return
JoinBatch
.
createViewIndexLookupBatch
(
this
);
}
public
Session
getSession
()
{
public
Session
getSession
()
{
return
createSession
;
return
createSession
;
}
}
...
@@ -199,21 +208,18 @@ public class ViewIndex extends BaseIndex implements SpatialIndex {
...
@@ -199,21 +208,18 @@ public class ViewIndex extends BaseIndex implements SpatialIndex {
TableFilter
[]
filters
,
int
filter
,
SortOrder
sortOrder
,
boolean
preliminary
)
{
TableFilter
[]
filters
,
int
filter
,
SortOrder
sortOrder
,
boolean
preliminary
)
{
assert
filters
!=
null
;
assert
filters
!=
null
;
Prepared
p
;
Prepared
p
;
SubQueryInfo
upper
=
session
.
getSubQueryInfo
();
session
.
pushSubQueryInfo
(
masks
,
filters
,
filter
,
sortOrder
);
SubQueryInfo
info
=
new
SubQueryInfo
(
upper
,
masks
,
filters
,
filter
,
sortOrder
,
preliminary
);
session
.
setSubQueryInfo
(
info
);
try
{
try
{
p
=
session
.
prepare
(
sql
,
true
);
p
=
session
.
prepare
(
sql
,
true
);
}
finally
{
}
finally
{
session
.
setSubQueryInfo
(
upper
);
session
.
popSubQueryInfo
(
);
}
}
return
(
Query
)
p
;
return
(
Query
)
p
;
}
}
private
Cursor
find
(
Session
session
,
SearchRow
first
,
SearchRow
last
,
private
Cursor
find
Recursive
(
Session
session
,
SearchRow
first
,
SearchRow
last
,
SearchRow
intersection
)
{
SearchRow
intersection
)
{
if
(
recursive
)
{
assert
recursive
;
LocalResult
recResult
=
view
.
getRecursiveResult
();
LocalResult
recResult
=
view
.
getRecursiveResult
();
if
(
recResult
!=
null
)
{
if
(
recResult
!=
null
)
{
recResult
.
reset
();
recResult
.
reset
();
...
@@ -222,7 +228,7 @@ public class ViewIndex extends BaseIndex implements SpatialIndex {
...
@@ -222,7 +228,7 @@ public class ViewIndex extends BaseIndex implements SpatialIndex {
if
(
query
==
null
)
{
if
(
query
==
null
)
{
query
=
(
Query
)
createSession
.
prepare
(
querySQL
,
true
);
query
=
(
Query
)
createSession
.
prepare
(
querySQL
,
true
);
}
}
if
(!(
query
instanceof
SelectUnion
))
{
if
(!
query
.
isUnion
(
))
{
throw
DbException
.
get
(
ErrorCode
.
SYNTAX_ERROR_2
,
throw
DbException
.
get
(
ErrorCode
.
SYNTAX_ERROR_2
,
"recursive queries without UNION ALL"
);
"recursive queries without UNION ALL"
);
}
}
...
@@ -262,6 +268,9 @@ public class ViewIndex extends BaseIndex implements SpatialIndex {
...
@@ -262,6 +268,9 @@ public class ViewIndex extends BaseIndex implements SpatialIndex {
result
.
done
();
result
.
done
();
return
new
ViewCursor
(
this
,
result
,
first
,
last
);
return
new
ViewCursor
(
this
,
result
,
first
,
last
);
}
}
public
void
setupQueryParameters
(
Session
session
,
SearchRow
first
,
SearchRow
last
,
SearchRow
intersection
)
{
ArrayList
<
Parameter
>
paramList
=
query
.
getParameters
();
ArrayList
<
Parameter
>
paramList
=
query
.
getParameters
();
if
(
originalParameters
!=
null
)
{
if
(
originalParameters
!=
null
)
{
for
(
int
i
=
0
,
size
=
originalParameters
.
size
();
i
<
size
;
i
++)
{
for
(
int
i
=
0
,
size
=
originalParameters
.
size
();
i
<
size
;
i
++)
{
...
@@ -298,6 +307,14 @@ public class ViewIndex extends BaseIndex implements SpatialIndex {
...
@@ -298,6 +307,14 @@ public class ViewIndex extends BaseIndex implements SpatialIndex {
setParameter
(
paramList
,
idx
++,
intersection
.
getValue
(
i
));
setParameter
(
paramList
,
idx
++,
intersection
.
getValue
(
i
));
}
}
}
}
}
private
Cursor
find
(
Session
session
,
SearchRow
first
,
SearchRow
last
,
SearchRow
intersection
)
{
if
(
recursive
)
{
return
findRecursive
(
session
,
first
,
last
,
intersection
);
}
setupQueryParameters
(
session
,
first
,
last
,
intersection
);
LocalResult
result
=
query
.
query
(
0
);
LocalResult
result
=
query
.
query
(
0
);
return
new
ViewCursor
(
this
,
result
,
first
,
last
);
return
new
ViewCursor
(
this
,
result
,
first
,
last
);
}
}
...
@@ -313,6 +330,10 @@ public class ViewIndex extends BaseIndex implements SpatialIndex {
...
@@ -313,6 +330,10 @@ public class ViewIndex extends BaseIndex implements SpatialIndex {
param
.
setValue
(
v
);
param
.
setValue
(
v
);
}
}
public
Query
getQuery
()
{
return
query
;
}
private
Query
getQuery
(
Session
session
,
int
[]
masks
,
private
Query
getQuery
(
Session
session
,
int
[]
masks
,
TableFilter
[]
filters
,
int
filter
,
SortOrder
sortOrder
)
{
TableFilter
[]
filters
,
int
filter
,
SortOrder
sortOrder
)
{
Query
q
=
prepareSubQuery
(
querySQL
,
session
,
masks
,
filters
,
filter
,
sortOrder
,
true
);
Query
q
=
prepareSubQuery
(
querySQL
,
session
,
masks
,
filters
,
filter
,
sortOrder
,
true
);
...
@@ -454,5 +475,4 @@ public class ViewIndex extends BaseIndex implements SpatialIndex {
...
@@ -454,5 +475,4 @@ public class ViewIndex extends BaseIndex implements SpatialIndex {
public
boolean
isRecursive
()
{
public
boolean
isRecursive
()
{
return
recursive
;
return
recursive
;
}
}
}
}
h2/src/main/org/h2/table/JoinBatch.java
0 → 100644
浏览文件 @
6b374192
差异被折叠。
点击展开。
h2/src/main/org/h2/table/SubQueryInfo.java
浏览文件 @
6b374192
...
@@ -19,7 +19,6 @@ public class SubQueryInfo {
...
@@ -19,7 +19,6 @@ public class SubQueryInfo {
private
TableFilter
[]
filters
;
private
TableFilter
[]
filters
;
private
int
filter
;
private
int
filter
;
private
SortOrder
sortOrder
;
private
SortOrder
sortOrder
;
private
boolean
preliminary
;
private
SubQueryInfo
upper
;
private
SubQueryInfo
upper
;
/**
/**
...
@@ -28,17 +27,14 @@ public class SubQueryInfo {
...
@@ -28,17 +27,14 @@ public class SubQueryInfo {
* @param filters table filters
* @param filters table filters
* @param filter current filter
* @param filter current filter
* @param sortOrder sort order
* @param sortOrder sort order
* @param preliminary if this is a preliminary query optimization
* without global conditions
*/
*/
public
SubQueryInfo
(
SubQueryInfo
upper
,
int
[]
masks
,
TableFilter
[]
filters
,
int
filter
,
public
SubQueryInfo
(
SubQueryInfo
upper
,
int
[]
masks
,
TableFilter
[]
filters
,
int
filter
,
SortOrder
sortOrder
,
boolean
preliminary
)
{
SortOrder
sortOrder
)
{
this
.
upper
=
upper
;
this
.
upper
=
upper
;
this
.
masks
=
masks
;
this
.
masks
=
masks
;
this
.
filters
=
filters
;
this
.
filters
=
filters
;
this
.
filter
=
filter
;
this
.
filter
=
filter
;
this
.
sortOrder
=
sortOrder
;
this
.
sortOrder
=
sortOrder
;
this
.
preliminary
=
preliminary
;
}
}
public
SubQueryInfo
getUpper
()
{
public
SubQueryInfo
getUpper
()
{
...
@@ -60,8 +56,4 @@ public class SubQueryInfo {
...
@@ -60,8 +56,4 @@ public class SubQueryInfo {
public
SortOrder
getSortOrder
()
{
public
SortOrder
getSortOrder
()
{
return
sortOrder
;
return
sortOrder
;
}
}
public
boolean
isPreliminary
()
{
return
preliminary
;
}
}
}
h2/src/main/org/h2/table/Table.java
浏览文件 @
6b374192
...
@@ -127,6 +127,10 @@ public abstract class Table extends SchemaObjectBase {
...
@@ -127,6 +127,10 @@ public abstract class Table extends SchemaObjectBase {
}
}
}
}
public
boolean
isView
()
{
return
false
;
}
/**
/**
* Lock the table for the given session.
* Lock the table for the given session.
* This method waits until the lock is granted.
* This method waits until the lock is granted.
...
...
h2/src/main/org/h2/table/TableFilter.java
浏览文件 @
6b374192
差异被折叠。
点击展开。
h2/src/main/org/h2/table/TableView.java
浏览文件 @
6b374192
...
@@ -218,6 +218,11 @@ public class TableView extends Table {
...
@@ -218,6 +218,11 @@ public class TableView extends Table {
}
}
}
}
@Override
public
boolean
isView
()
{
return
true
;
}
/**
/**
* Check if this view is currently invalid.
* Check if this view is currently invalid.
*
*
...
...
h2/src/main/org/h2/util/LazyFuture.java
0 → 100644
浏览文件 @
6b374192
/*
* Copyright 2004-2014 H2 Group. Multiple-Licensed under the MPL 2.0,
* and the EPL 1.0 (http://h2database.com/html/license.html).
* Initial Developer: H2 Group
*/
package
org
.
h2
.
util
;
import
java.util.concurrent.CancellationException
;
import
java.util.concurrent.ExecutionException
;
import
java.util.concurrent.Future
;
import
java.util.concurrent.TimeUnit
;
import
org.h2.message.DbException
;
/**
* Single threaded lazy future.
*
* @param <T>
* @author Sergi Vladykin
*/
public
abstract
class
LazyFuture
<
T
>
implements
Future
<
T
>
{
private
static
final
int
S_READY
=
0
;
private
static
final
int
S_DONE
=
1
;
private
static
final
int
S_ERROR
=
2
;
private
static
final
int
S_CANCELED
=
3
;
private
int
state
=
S_READY
;
private
T
result
;
private
Exception
error
;
/**
* Reset this future to the initial state.
*
* @return {@code false} if it was already in initial state
*/
public
boolean
reset
()
{
if
(
state
==
S_READY
)
{
return
false
;
}
state
=
S_READY
;
result
=
null
;
error
=
null
;
return
true
;
}
/**
* Run computation and produce the result.
*
* @return the result of computation
*/
protected
abstract
T
run
()
throws
Exception
;
@Override
public
boolean
cancel
(
boolean
mayInterruptIfRunning
)
{
if
(
state
!=
S_READY
)
{
return
false
;
}
state
=
S_CANCELED
;
return
true
;
}
@Override
public
T
get
()
throws
InterruptedException
,
ExecutionException
{
switch
(
state
)
{
case
S_READY:
try
{
result
=
run
();
state
=
S_DONE
;
}
catch
(
Exception
e
)
{
error
=
e
;
if
(
e
instanceof
InterruptedException
)
{
throw
(
InterruptedException
)
e
;
}
throw
new
ExecutionException
(
e
);
}
finally
{
if
(
state
!=
S_DONE
)
{
state
=
S_ERROR
;
}
}
return
result
;
case
S_DONE:
return
result
;
case
S_ERROR:
throw
new
ExecutionException
(
error
);
case
S_CANCELED:
throw
new
CancellationException
();
default
:
throw
DbException
.
throwInternalError
();
}
}
@Override
public
T
get
(
long
timeout
,
TimeUnit
unit
)
throws
InterruptedException
,
ExecutionException
{
return
get
();
}
@Override
public
boolean
isCancelled
()
{
return
state
==
S_CANCELED
;
}
@Override
public
boolean
isDone
()
{
return
state
!=
S_READY
;
}
}
h2/src/test/org/h2/test/db/TestTableEngines.java
浏览文件 @
6b374192
差异被折叠。
点击展开。
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论