From 519b64e50cee2c0293ff541fc9225528169ee9c2 Mon Sep 17 00:00:00 2001 From: wangxiaoyu8 Date: Mon, 7 Sep 2015 10:00:58 +0800 Subject: [PATCH] KYLIN-983 Query sql offset keyword bug --- .../java/org/apache/kylin/storage/StorageContext.java | 9 +++++++++ .../org/apache/kylin/query/relnode/OLAPLimitRel.java | 5 +++++ .../org/apache/kylin/query/test/ITKylinQueryTest.java | 3 +-- .../test/resources/query/sql_verifyCount/query04.sql | 19 ------------------- .../query/sql_verifyCount/query04.sql.disable | 19 +++++++++++++++++++ .../test/resources/query/sql_verifyCount/query05.sql | 19 ------------------- .../query/sql_verifyCount/query05.sql.disable | 19 +++++++++++++++++++ .../test/resources/query/sql_verifyCount/query06.sql | 19 ------------------- .../query/sql_verifyCount/query06.sql.disable | 19 +++++++++++++++++++ .../test/resources/query/sql_verifyCount/query07.sql | 19 ------------------- .../query/sql_verifyCount/query07.sql.disable | 19 +++++++++++++++++++ .../test/resources/query/sql_verifyCount/query08.sql | 19 +++++++++++++++++++ .../query/sql_verifyCount/query08.sql.expected | 1 + .../hbase/cube/v1/SerializedHBaseTupleIterator.java | 2 +- 14 files changed, 112 insertions(+), 79 deletions(-) delete mode 100644 query/src/test/resources/query/sql_verifyCount/query04.sql create mode 100644 query/src/test/resources/query/sql_verifyCount/query04.sql.disable delete mode 100644 query/src/test/resources/query/sql_verifyCount/query05.sql create mode 100644 query/src/test/resources/query/sql_verifyCount/query05.sql.disable delete mode 100644 query/src/test/resources/query/sql_verifyCount/query06.sql create mode 100644 query/src/test/resources/query/sql_verifyCount/query06.sql.disable delete mode 100644 query/src/test/resources/query/sql_verifyCount/query07.sql create mode 100644 query/src/test/resources/query/sql_verifyCount/query07.sql.disable create mode 100644 query/src/test/resources/query/sql_verifyCount/query08.sql create mode 100644 query/src/test/resources/query/sql_verifyCount/query08.sql.expected diff --git a/core-storage/src/main/java/org/apache/kylin/storage/StorageContext.java b/core-storage/src/main/java/org/apache/kylin/storage/StorageContext.java index 3d4f04b..de83aca 100644 --- a/core-storage/src/main/java/org/apache/kylin/storage/StorageContext.java +++ b/core-storage/src/main/java/org/apache/kylin/storage/StorageContext.java @@ -40,6 +40,7 @@ public class StorageContext { private String connUrl; private int threshold; private int limit; + private int offset; private boolean hasSort; private List sortMeasures; private List sortOrders; @@ -94,6 +95,14 @@ public class StorageContext { this.limit = l; } + public int getOffset() { + return offset; + } + + public void setOffset(int offset) { + this.offset = offset; + } + public void enableLimit() { this.enableLimit = true; } diff --git a/query/src/main/java/org/apache/kylin/query/relnode/OLAPLimitRel.java b/query/src/main/java/org/apache/kylin/query/relnode/OLAPLimitRel.java index a31cc21..60acd40 100644 --- a/query/src/main/java/org/apache/kylin/query/relnode/OLAPLimitRel.java +++ b/query/src/main/java/org/apache/kylin/query/relnode/OLAPLimitRel.java @@ -78,6 +78,11 @@ public class OLAPLimitRel extends SingleRel implements OLAPRel { Number limitValue = (Number) (((RexLiteral) localFetch).getValue()); int limit = limitValue.intValue(); this.context.storageContext.setLimit(limit); + if(localOffset != null) { + Number offsetValue = (Number) (((RexLiteral) localOffset).getValue()); + int offset = offsetValue.intValue(); + this.context.storageContext.setOffset(offset); + } } private ColumnRowType buildColumnRowType() { diff --git a/query/src/test/java/org/apache/kylin/query/test/ITKylinQueryTest.java b/query/src/test/java/org/apache/kylin/query/test/ITKylinQueryTest.java index a08d595..72d7c4a 100644 --- a/query/src/test/java/org/apache/kylin/query/test/ITKylinQueryTest.java +++ b/query/src/test/java/org/apache/kylin/query/test/ITKylinQueryTest.java @@ -127,9 +127,8 @@ public class ITKylinQueryTest extends KylinTestBase { execAndCompQuery("src/test/resources/query/sql", null, true); } - @Ignore @Test - public void testSimpleQuery() throws Exception { + public void testVerifyQuery() throws Exception { verifyResultRowCount("src/test/resources/query/sql_verifyCount"); } diff --git a/query/src/test/resources/query/sql_verifyCount/query04.sql b/query/src/test/resources/query/sql_verifyCount/query04.sql deleted file mode 100644 index 9d3e409..0000000 --- a/query/src/test/resources/query/sql_verifyCount/query04.sql +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select * from test_kylin_fact limit 100 diff --git a/query/src/test/resources/query/sql_verifyCount/query04.sql.disable b/query/src/test/resources/query/sql_verifyCount/query04.sql.disable new file mode 100644 index 0000000..9d3e409 --- /dev/null +++ b/query/src/test/resources/query/sql_verifyCount/query04.sql.disable @@ -0,0 +1,19 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- + +select * from test_kylin_fact limit 100 diff --git a/query/src/test/resources/query/sql_verifyCount/query05.sql b/query/src/test/resources/query/sql_verifyCount/query05.sql deleted file mode 100644 index 753a85a..0000000 --- a/query/src/test/resources/query/sql_verifyCount/query05.sql +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select price from test_kylin_fact limit 100 diff --git a/query/src/test/resources/query/sql_verifyCount/query05.sql.disable b/query/src/test/resources/query/sql_verifyCount/query05.sql.disable new file mode 100644 index 0000000..753a85a --- /dev/null +++ b/query/src/test/resources/query/sql_verifyCount/query05.sql.disable @@ -0,0 +1,19 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- + +select price from test_kylin_fact limit 100 diff --git a/query/src/test/resources/query/sql_verifyCount/query06.sql b/query/src/test/resources/query/sql_verifyCount/query06.sql deleted file mode 100644 index 39578a4..0000000 --- a/query/src/test/resources/query/sql_verifyCount/query06.sql +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select lstg_format_name from test_kylin_fact limit 100 diff --git a/query/src/test/resources/query/sql_verifyCount/query06.sql.disable b/query/src/test/resources/query/sql_verifyCount/query06.sql.disable new file mode 100644 index 0000000..39578a4 --- /dev/null +++ b/query/src/test/resources/query/sql_verifyCount/query06.sql.disable @@ -0,0 +1,19 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- + +select lstg_format_name from test_kylin_fact limit 100 diff --git a/query/src/test/resources/query/sql_verifyCount/query07.sql b/query/src/test/resources/query/sql_verifyCount/query07.sql deleted file mode 100644 index 0afb493..0000000 --- a/query/src/test/resources/query/sql_verifyCount/query07.sql +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select price,lstg_format_name from test_kylin_fact limit 100 diff --git a/query/src/test/resources/query/sql_verifyCount/query07.sql.disable b/query/src/test/resources/query/sql_verifyCount/query07.sql.disable new file mode 100644 index 0000000..0afb493 --- /dev/null +++ b/query/src/test/resources/query/sql_verifyCount/query07.sql.disable @@ -0,0 +1,19 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- + +select price,lstg_format_name from test_kylin_fact limit 100 diff --git a/query/src/test/resources/query/sql_verifyCount/query08.sql b/query/src/test/resources/query/sql_verifyCount/query08.sql new file mode 100644 index 0000000..0f467f8 --- /dev/null +++ b/query/src/test/resources/query/sql_verifyCount/query08.sql @@ -0,0 +1,19 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- + +select lstg_format_name,sum(price) as sp from test_kylin_fact group by lstg_format_name limit 1 offset 2 diff --git a/query/src/test/resources/query/sql_verifyCount/query08.sql.expected b/query/src/test/resources/query/sql_verifyCount/query08.sql.expected new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/query/src/test/resources/query/sql_verifyCount/query08.sql.expected @@ -0,0 +1 @@ +1 diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/SerializedHBaseTupleIterator.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/SerializedHBaseTupleIterator.java index 5f55683..e433b78 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/SerializedHBaseTupleIterator.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/SerializedHBaseTupleIterator.java @@ -99,7 +99,7 @@ public class SerializedHBaseTupleIterator implements ITupleIterator { return true; // 1. check limit - if (context.isLimitEnabled() && scanCount >= context.getLimit()) { + if (context.isLimitEnabled() && scanCount >= context.getLimit() + context.getOffset()) { return false; } // 2. check partial result -- 1.9.1