This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit ce8031ffae373d80c86a35c1905e76c6c892cffc Author: Ritik Raj <raj.ritik9...@gmail.com> AuthorDate: Tue Jul 22 12:52:26 2025 +0530 [ASTERIXDB-3601][STO] Fix calculation of presentColumns - user model changes: no - storage format changes: no - interface changes: no Details: During the merge, there was an issue setting up the columnIndexes from the additional pageSegments, which caused the extra columns to be ignored Ext-ref: MB-67741 Change-Id: Id43277dc678ab6578c27d3cf114063acbcc849fb Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20127 Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Peeyush Gupta <peeyush.gu...@couchbase.com> --- .../ASTERIXDB-3601/ASTERIXDB-3601.001.ddl.sqlpp | 28 + .../ASTERIXDB-3601/ASTERIXDB-3601.002.update.sqlpp | 1874 ++++++++++++++++++++ .../ASTERIXDB-3601/ASTERIXDB-3601.003.query.sqlpp | 22 + .../io/merge/ASTERIXDB-3601/ASTERIXDB-3601.003.adm | 9 + .../runtimets/testsuite_single_partition_sqlpp.xml | 5 + .../column/tuple/MergeColumnTupleReference.java | 1 + .../zero/readers/DefaultColumnPageZeroReader.java | 4 + .../zero/readers/SparseColumnPageZeroReader.java | 9 +- .../DefaultColumnMultiPageZeroReader.java | 4 + .../multipage/SparseColumnMultiPageZeroReader.java | 7 +- .../impls/btree/ColumnBTreeReadLeafFrame.java | 4 + .../column/impls/btree/IColumnPageZeroReader.java | 2 + 12 files changed, 1957 insertions(+), 12 deletions(-) diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/io/merge/ASTERIXDB-3601/ASTERIXDB-3601.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/io/merge/ASTERIXDB-3601/ASTERIXDB-3601.001.ddl.sqlpp new file mode 100644 index 0000000000..4ce94ecbcc --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/io/merge/ASTERIXDB-3601/ASTERIXDB-3601.001.ddl.sqlpp @@ -0,0 +1,28 @@ +/* + * 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. + */ + +DROP DATAVERSE test if exists; +CREATE DATAVERSE test; +USE test; + +CREATE DATASET ds PRIMARY KEY (id: String) WITH { + "storage-format" : { + "format": "column" + } + }; \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/io/merge/ASTERIXDB-3601/ASTERIXDB-3601.002.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/io/merge/ASTERIXDB-3601/ASTERIXDB-3601.002.update.sqlpp new file mode 100644 index 0000000000..cad28fadb9 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/io/merge/ASTERIXDB-3601/ASTERIXDB-3601.002.update.sqlpp @@ -0,0 +1,1874 @@ +/* + * 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. + */ + +USE test; + +UPSERT INTO ds ( +{ + "id": "190", + "column189001": true, + "column189002": "value189002", + "column189003": 1890020, + "column189004": 283504.623, + "column189005": null, + "column189006": false, + "column189007": "value189007", + "column189008": 1890070, + "column189009": 283512.123, + "column189010": null, + "column189011": true, + "column189012": "value189012", + "column189013": 1890120, + "column189014": 283519.623, + "column189015": null, + "column189016": false, + "column189017": "value189017", + "column189018": 1890170, + "column189019": 283527.123, + "column189020": null, + "column189021": true, + "column189022": "value189022", + "column189023": 1890220, + "column189024": 283534.623, + "column189025": null, + "column189026": false, + "column189027": "value189027", + "column189028": 1890270, + "column189029": 283542.123, + "column189030": null, + "column189031": true, + "column189032": "value189032", + "column189033": 1890320, + "column189034": 283549.623, + "column189035": null, + "column189036": false, + "column189037": "value189037", + "column189038": 1890370, + "column189039": 283557.123, + "column189040": null, + "column189041": true, + "column189042": "value189042", + "column189043": 1890420, + "column189044": 283564.623, + "column189045": null, + "column189046": false, + "column189047": "value189047", + "column189048": 1890470, + "column189049": 283572.123, + "column189050": null, + "column189051": true, + "column189052": "value189052", + "column189053": 1890520, + "column189054": 283579.623, + "column189055": null, + "column189056": false, + "column189057": "value189057", + "column189058": 1890570, + "column189059": 283587.123, + "column189060": null, + "column189061": true, + "column189062": "value189062", + "column189063": 1890620, + "column189064": 283594.623, + "column189065": null, + "column189066": false, + "column189067": "value189067", + "column189068": 1890670, + "column189069": 283602.123, + "column189070": null, + "column189071": true, + "column189072": "value189072", + "column189073": 1890720, + "column189074": 283609.623, + "column189075": null, + "column189076": false, + "column189077": "value189077", + "column189078": 1890770, + "column189079": 283617.123, + "column189080": null, + "column189081": true, + "column189082": "value189082", + "column189083": 1890820, + "column189084": 283624.623, + "column189085": null, + "column189086": false, + "column189087": "value189087", + "column189088": 1890870, + "column189089": 283632.123, + "column189090": null, + "column189091": true, + "column189092": "value189092", + "column189093": 1890920, + "column189094": 283639.623, + "column189095": null, + "column189096": false, + "column189097": "value189097", + "column189098": 1890970, + "column189099": 283647.123, + "column189100": null, + "column189101": true, + "column189102": "value189102", + "column189103": 1891020, + "column189104": 283654.623, + "column189105": null, + "column189106": false, + "column189107": "value189107", + "column189108": 1891070, + "column189109": 283662.123, + "column189110": null, + "column189111": true, + "column189112": "value189112", + "column189113": 1891120, + "column189114": 283669.623, + "column189115": null, + "column189116": false, + "column189117": "value189117", + "column189118": 1891170, + "column189119": 283677.123, + "column189120": null, + "column189121": true, + "column189122": "value189122", + "column189123": 1891220, + "column189124": 283684.623, + "column189125": null, + "column189126": false, + "column189127": "value189127", + "column189128": 1891270, + "column189129": 283692.123, + "column189130": null, + "column189131": true, + "column189132": "value189132", + "column189133": 1891320, + "column189134": 283699.623, + "column189135": null, + "column189136": false, + "column189137": "value189137", + "column189138": 1891370, + "column189139": 283707.123, + "column189140": null, + "column189141": true, + "column189142": "value189142", + "column189143": 1891420, + "column189144": 283714.623, + "column189145": null, + "column189146": false, + "column189147": "value189147", + "column189148": 1891470, + "column189149": 283722.123, + "column189150": null, + "column189151": true, + "column189152": "value189152", + "column189153": 1891520, + "column189154": 283729.623, + "column189155": null, + "column189156": false, + "column189157": "value189157", + "column189158": 1891570, + "column189159": 283737.123, + "column189160": null, + "column189161": true, + "column189162": "value189162", + "column189163": 1891620, + "column189164": 283744.623, + "column189165": null, + "column189166": false, + "column189167": "value189167", + "column189168": 1891670, + "column189169": 283752.123, + "column189170": null, + "column189171": true, + "column189172": "value189172", + "column189173": 1891720, + "column189174": 283759.623, + "column189175": null, + "column189176": false, + "column189177": "value189177", + "column189178": 1891770, + "column189179": 283767.123, + "column189180": null, + "column189181": true, + "column189182": "value189182", + "column189183": 1891820, + "column189184": 283774.623, + "column189185": null, + "column189186": false, + "column189187": "value189187", + "column189188": 1891870, + "column189189": 283782.123, + "column189190": null, + "column189191": true, + "column189192": "value189192", + "column189193": 1891920, + "column189194": 283789.623, + "column189195": null, + "column189196": false, + "column189197": "value189197", + "column189198": 1891970, + "column189199": 283797.123, + "column189200": null +}); + + +UPSERT INTO ds ( +{ + "id": "204", + "column203001": true, + "column203002": "value203002", + "column203003": 2030020, + "column203004": 304504.623, + "column203005": null, + "column203006": false, + "column203007": "value203007", + "column203008": 2030070, + "column203009": 304512.123, + "column203010": null, + "column203011": true, + "column203012": "value203012", + "column203013": 2030120, + "column203014": 304519.623, + "column203015": null, + "column203016": false, + "column203017": "value203017", + "column203018": 2030170, + "column203019": 304527.123, + "column203020": null, + "column203021": true, + "column203022": "value203022", + "column203023": 2030220, + "column203024": 304534.623, + "column203025": null, + "column203026": false, + "column203027": "value203027", + "column203028": 2030270, + "column203029": 304542.123, + "column203030": null, + "column203031": true, + "column203032": "value203032", + "column203033": 2030320, + "column203034": 304549.623, + "column203035": null, + "column203036": false, + "column203037": "value203037", + "column203038": 2030370, + "column203039": 304557.123, + "column203040": null, + "column203041": true, + "column203042": "value203042", + "column203043": 2030420, + "column203044": 304564.623, + "column203045": null, + "column203046": false, + "column203047": "value203047", + "column203048": 2030470, + "column203049": 304572.123, + "column203050": null, + "column203051": true, + "column203052": "value203052", + "column203053": 2030520, + "column203054": 304579.623, + "column203055": null, + "column203056": false, + "column203057": "value203057", + "column203058": 2030570, + "column203059": 304587.123, + "column203060": null, + "column203061": true, + "column203062": "value203062", + "column203063": 2030620, + "column203064": 304594.623, + "column203065": null, + "column203066": false, + "column203067": "value203067", + "column203068": 2030670, + "column203069": 304602.123, + "column203070": null, + "column203071": true, + "column203072": "value203072", + "column203073": 2030720, + "column203074": 304609.623, + "column203075": null, + "column203076": false, + "column203077": "value203077", + "column203078": 2030770, + "column203079": 304617.123, + "column203080": null, + "column203081": true, + "column203082": "value203082", + "column203083": 2030820, + "column203084": 304624.623, + "column203085": null, + "column203086": false, + "column203087": "value203087", + "column203088": 2030870, + "column203089": 304632.123, + "column203090": null, + "column203091": true, + "column203092": "value203092", + "column203093": 2030920, + "column203094": 304639.623, + "column203095": null, + "column203096": false, + "column203097": "value203097", + "column203098": 2030970, + "column203099": 304647.123, + "column203100": null, + "column203101": true, + "column203102": "value203102", + "column203103": 2031020, + "column203104": 304654.623, + "column203105": null, + "column203106": false, + "column203107": "value203107", + "column203108": 2031070, + "column203109": 304662.123, + "column203110": null, + "column203111": true, + "column203112": "value203112", + "column203113": 2031120, + "column203114": 304669.623, + "column203115": null, + "column203116": false, + "column203117": "value203117", + "column203118": 2031170, + "column203119": 304677.123, + "column203120": null, + "column203121": true, + "column203122": "value203122", + "column203123": 2031220, + "column203124": 304684.623, + "column203125": null, + "column203126": false, + "column203127": "value203127", + "column203128": 2031270, + "column203129": 304692.123, + "column203130": null, + "column203131": true, + "column203132": "value203132", + "column203133": 2031320, + "column203134": 304699.623, + "column203135": null, + "column203136": false, + "column203137": "value203137", + "column203138": 2031370, + "column203139": 304707.123, + "column203140": null, + "column203141": true, + "column203142": "value203142", + "column203143": 2031420, + "column203144": 304714.623, + "column203145": null, + "column203146": false, + "column203147": "value203147", + "column203148": 2031470, + "column203149": 304722.123, + "column203150": null, + "column203151": true, + "column203152": "value203152", + "column203153": 2031520, + "column203154": 304729.623, + "column203155": null, + "column203156": false, + "column203157": "value203157", + "column203158": 2031570, + "column203159": 304737.123, + "column203160": null, + "column203161": true, + "column203162": "value203162", + "column203163": 2031620, + "column203164": 304744.623, + "column203165": null, + "column203166": false, + "column203167": "value203167", + "column203168": 2031670, + "column203169": 304752.123, + "column203170": null, + "column203171": true, + "column203172": "value203172", + "column203173": 2031720, + "column203174": 304759.623, + "column203175": null, + "column203176": false, + "column203177": "value203177", + "column203178": 2031770, + "column203179": 304767.123, + "column203180": null, + "column203181": true, + "column203182": "value203182", + "column203183": 2031820, + "column203184": 304774.623, + "column203185": null, + "column203186": false, + "column203187": "value203187", + "column203188": 2031870, + "column203189": 304782.123, + "column203190": null, + "column203191": true, + "column203192": "value203192", + "column203193": 2031920, + "column203194": 304789.623, + "column203195": null, + "column203196": false, + "column203197": "value203197", + "column203198": 2031970, + "column203199": 304797.123, + "column203200": null + } +); + +UPSERT INTO ds ( +{ + "id": "23", + "column22001": true, + "column22002": "value22002", + "column22003": 220020, + "column22004": 33004.623, + "column22005": null, + "column22006": false, + "column22007": "value22007", + "column22008": 220070, + "column22009": 33012.123, + "column22010": null, + "column22011": true, + "column22012": "value22012", + "column22013": 220120, + "column22014": 33019.623, + "column22015": null, + "column22016": false, + "column22017": "value22017", + "column22018": 220170, + "column22019": 33027.123, + "column22020": null, + "column22021": true, + "column22022": "value22022", + "column22023": 220220, + "column22024": 33034.623, + "column22025": null, + "column22026": false, + "column22027": "value22027", + "column22028": 220270, + "column22029": 33042.123, + "column22030": null, + "column22031": true, + "column22032": "value22032", + "column22033": 220320, + "column22034": 33049.623, + "column22035": null, + "column22036": false, + "column22037": "value22037", + "column22038": 220370, + "column22039": 33057.123, + "column22040": null, + "column22041": true, + "column22042": "value22042", + "column22043": 220420, + "column22044": 33064.623, + "column22045": null, + "column22046": false, + "column22047": "value22047", + "column22048": 220470, + "column22049": 33072.123, + "column22050": null, + "column22051": true, + "column22052": "value22052", + "column22053": 220520, + "column22054": 33079.623, + "column22055": null, + "column22056": false, + "column22057": "value22057", + "column22058": 220570, + "column22059": 33087.123, + "column22060": null, + "column22061": true, + "column22062": "value22062", + "column22063": 220620, + "column22064": 33094.623, + "column22065": null, + "column22066": false, + "column22067": "value22067", + "column22068": 220670, + "column22069": 33102.123, + "column22070": null, + "column22071": true, + "column22072": "value22072", + "column22073": 220720, + "column22074": 33109.623, + "column22075": null, + "column22076": false, + "column22077": "value22077", + "column22078": 220770, + "column22079": 33117.123, + "column22080": null, + "column22081": true, + "column22082": "value22082", + "column22083": 220820, + "column22084": 33124.623, + "column22085": null, + "column22086": false, + "column22087": "value22087", + "column22088": 220870, + "column22089": 33132.123, + "column22090": null, + "column22091": true, + "column22092": "value22092", + "column22093": 220920, + "column22094": 33139.623, + "column22095": null, + "column22096": false, + "column22097": "value22097", + "column22098": 220970, + "column22099": 33147.123, + "column22100": null, + "column22101": true, + "column22102": "value22102", + "column22103": 221020, + "column22104": 33154.623, + "column22105": null, + "column22106": false, + "column22107": "value22107", + "column22108": 221070, + "column22109": 33162.123, + "column22110": null, + "column22111": true, + "column22112": "value22112", + "column22113": 221120, + "column22114": 33169.623, + "column22115": null, + "column22116": false, + "column22117": "value22117", + "column22118": 221170, + "column22119": 33177.123, + "column22120": null, + "column22121": true, + "column22122": "value22122", + "column22123": 221220, + "column22124": 33184.623, + "column22125": null, + "column22126": false, + "column22127": "value22127", + "column22128": 221270, + "column22129": 33192.123, + "column22130": null, + "column22131": true, + "column22132": "value22132", + "column22133": 221320, + "column22134": 33199.623, + "column22135": null, + "column22136": false, + "column22137": "value22137", + "column22138": 221370, + "column22139": 33207.123, + "column22140": null, + "column22141": true, + "column22142": "value22142", + "column22143": 221420, + "column22144": 33214.623, + "column22145": null, + "column22146": false, + "column22147": "value22147", + "column22148": 221470, + "column22149": 33222.123, + "column22150": null, + "column22151": true, + "column22152": "value22152", + "column22153": 221520, + "column22154": 33229.623, + "column22155": null, + "column22156": false, + "column22157": "value22157", + "column22158": 221570, + "column22159": 33237.123, + "column22160": null, + "column22161": true, + "column22162": "value22162", + "column22163": 221620, + "column22164": 33244.623, + "column22165": null, + "column22166": false, + "column22167": "value22167", + "column22168": 221670, + "column22169": 33252.123, + "column22170": null, + "column22171": true, + "column22172": "value22172", + "column22173": 221720, + "column22174": 33259.623, + "column22175": null, + "column22176": false, + "column22177": "value22177", + "column22178": 221770, + "column22179": 33267.123, + "column22180": null, + "column22181": true, + "column22182": "value22182", + "column22183": 221820, + "column22184": 33274.623, + "column22185": null, + "column22186": false, + "column22187": "value22187", + "column22188": 221870, + "column22189": 33282.123, + "column22190": null, + "column22191": true, + "column22192": "value22192", + "column22193": 221920, + "column22194": 33289.623, + "column22195": null, + "column22196": false, + "column22197": "value22197", + "column22198": 221970, + "column22199": 33297.123, + "column22200": null + } +); + +UPSERT INTO ds ( +{ + "id": "490", + "column489001": true, + "column489002": "value489002", + "column489003": 4890020, + "column489004": 733504.623, + "column489005": null, + "column489006": false, + "column489007": "value489007", + "column489008": 4890070, + "column489009": 733512.123, + "column489010": null, + "column489011": true, + "column489012": "value489012", + "column489013": 4890120, + "column489014": 733519.623, + "column489015": null, + "column489016": false, + "column489017": "value489017", + "column489018": 4890170, + "column489019": 733527.123, + "column489020": null, + "column489021": true, + "column489022": "value489022", + "column489023": 4890220, + "column489024": 733534.623, + "column489025": null, + "column489026": false, + "column489027": "value489027", + "column489028": 4890270, + "column489029": 733542.123, + "column489030": null, + "column489031": true, + "column489032": "value489032", + "column489033": 4890320, + "column489034": 733549.623, + "column489035": null, + "column489036": false, + "column489037": "value489037", + "column489038": 4890370, + "column489039": 733557.123, + "column489040": null, + "column489041": true, + "column489042": "value489042", + "column489043": 4890420, + "column489044": 733564.623, + "column489045": null, + "column489046": false, + "column489047": "value489047", + "column489048": 4890470, + "column489049": 733572.123, + "column489050": null, + "column489051": true, + "column489052": "value489052", + "column489053": 4890520, + "column489054": 733579.623, + "column489055": null, + "column489056": false, + "column489057": "value489057", + "column489058": 4890570, + "column489059": 733587.123, + "column489060": null, + "column489061": true, + "column489062": "value489062", + "column489063": 4890620, + "column489064": 733594.623, + "column489065": null, + "column489066": false, + "column489067": "value489067", + "column489068": 4890670, + "column489069": 733602.123, + "column489070": null, + "column489071": true, + "column489072": "value489072", + "column489073": 4890720, + "column489074": 733609.623, + "column489075": null, + "column489076": false, + "column489077": "value489077", + "column489078": 4890770, + "column489079": 733617.123, + "column489080": null, + "column489081": true, + "column489082": "value489082", + "column489083": 4890820, + "column489084": 733624.623, + "column489085": null, + "column489086": false, + "column489087": "value489087", + "column489088": 4890870, + "column489089": 733632.123, + "column489090": null, + "column489091": true, + "column489092": "value489092", + "column489093": 4890920, + "column489094": 733639.623, + "column489095": null, + "column489096": false, + "column489097": "value489097", + "column489098": 4890970, + "column489099": 733647.123, + "column489100": null, + "column489101": true, + "column489102": "value489102", + "column489103": 4891020, + "column489104": 733654.623, + "column489105": null, + "column489106": false, + "column489107": "value489107", + "column489108": 4891070, + "column489109": 733662.123, + "column489110": null, + "column489111": true, + "column489112": "value489112", + "column489113": 4891120, + "column489114": 733669.623, + "column489115": null, + "column489116": false, + "column489117": "value489117", + "column489118": 4891170, + "column489119": 733677.123, + "column489120": null, + "column489121": true, + "column489122": "value489122", + "column489123": 4891220, + "column489124": 733684.623, + "column489125": null, + "column489126": false, + "column489127": "value489127", + "column489128": 4891270, + "column489129": 733692.123, + "column489130": null, + "column489131": true, + "column489132": "value489132", + "column489133": 4891320, + "column489134": 733699.623, + "column489135": null, + "column489136": false, + "column489137": "value489137", + "column489138": 4891370, + "column489139": 733707.123, + "column489140": null, + "column489141": true, + "column489142": "value489142", + "column489143": 4891420, + "column489144": 733714.623, + "column489145": null, + "column489146": false, + "column489147": "value489147", + "column489148": 4891470, + "column489149": 733722.123, + "column489150": null, + "column489151": true, + "column489152": "value489152", + "column489153": 4891520, + "column489154": 733729.623, + "column489155": null, + "column489156": false, + "column489157": "value489157", + "column489158": 4891570, + "column489159": 733737.123, + "column489160": null, + "column489161": true, + "column489162": "value489162", + "column489163": 4891620, + "column489164": 733744.623, + "column489165": null, + "column489166": false, + "column489167": "value489167", + "column489168": 4891670, + "column489169": 733752.123, + "column489170": null, + "column489171": true, + "column489172": "value489172", + "column489173": 4891720, + "column489174": 733759.623, + "column489175": null, + "column489176": false, + "column489177": "value489177", + "column489178": 4891770, + "column489179": 733767.123, + "column489180": null, + "column489181": true, + "column489182": "value489182", + "column489183": 4891820, + "column489184": 733774.623, + "column489185": null, + "column489186": false, + "column489187": "value489187", + "column489188": 4891870, + "column489189": 733782.123, + "column489190": null, + "column489191": true, + "column489192": "value489192", + "column489193": 4891920, + "column489194": 733789.623, + "column489195": null, + "column489196": false, + "column489197": "value489197", + "column489198": 4891970, + "column489199": 733797.123, + "column489200": null + } +); + +UPSERT INTO ds ( +{ + "id": "544", + "column543001": true, + "column543002": "value543002", + "column543003": 5430020, + "column543004": 814504.623, + "column543005": null, + "column543006": false, + "column543007": "value543007", + "column543008": 5430070, + "column543009": 814512.123, + "column543010": null, + "column543011": true, + "column543012": "value543012", + "column543013": 5430120, + "column543014": 814519.623, + "column543015": null, + "column543016": false, + "column543017": "value543017", + "column543018": 5430170, + "column543019": 814527.123, + "column543020": null, + "column543021": true, + "column543022": "value543022", + "column543023": 5430220, + "column543024": 814534.623, + "column543025": null, + "column543026": false, + "column543027": "value543027", + "column543028": 5430270, + "column543029": 814542.123, + "column543030": null, + "column543031": true, + "column543032": "value543032", + "column543033": 5430320, + "column543034": 814549.623, + "column543035": null, + "column543036": false, + "column543037": "value543037", + "column543038": 5430370, + "column543039": 814557.123, + "column543040": null, + "column543041": true, + "column543042": "value543042", + "column543043": 5430420, + "column543044": 814564.623, + "column543045": null, + "column543046": false, + "column543047": "value543047", + "column543048": 5430470, + "column543049": 814572.123, + "column543050": null, + "column543051": true, + "column543052": "value543052", + "column543053": 5430520, + "column543054": 814579.623, + "column543055": null, + "column543056": false, + "column543057": "value543057", + "column543058": 5430570, + "column543059": 814587.123, + "column543060": null, + "column543061": true, + "column543062": "value543062", + "column543063": 5430620, + "column543064": 814594.623, + "column543065": null, + "column543066": false, + "column543067": "value543067", + "column543068": 5430670, + "column543069": 814602.123, + "column543070": null, + "column543071": true, + "column543072": "value543072", + "column543073": 5430720, + "column543074": 814609.623, + "column543075": null, + "column543076": false, + "column543077": "value543077", + "column543078": 5430770, + "column543079": 814617.123, + "column543080": null, + "column543081": true, + "column543082": "value543082", + "column543083": 5430820, + "column543084": 814624.623, + "column543085": null, + "column543086": false, + "column543087": "value543087", + "column543088": 5430870, + "column543089": 814632.123, + "column543090": null, + "column543091": true, + "column543092": "value543092", + "column543093": 5430920, + "column543094": 814639.623, + "column543095": null, + "column543096": false, + "column543097": "value543097", + "column543098": 5430970, + "column543099": 814647.123, + "column543100": null, + "column543101": true, + "column543102": "value543102", + "column543103": 5431020, + "column543104": 814654.623, + "column543105": null, + "column543106": false, + "column543107": "value543107", + "column543108": 5431070, + "column543109": 814662.123, + "column543110": null, + "column543111": true, + "column543112": "value543112", + "column543113": 5431120, + "column543114": 814669.623, + "column543115": null, + "column543116": false, + "column543117": "value543117", + "column543118": 5431170, + "column543119": 814677.123, + "column543120": null, + "column543121": true, + "column543122": "value543122", + "column543123": 5431220, + "column543124": 814684.623, + "column543125": null, + "column543126": false, + "column543127": "value543127", + "column543128": 5431270, + "column543129": 814692.123, + "column543130": null, + "column543131": true, + "column543132": "value543132", + "column543133": 5431320, + "column543134": 814699.623, + "column543135": null, + "column543136": false, + "column543137": "value543137", + "column543138": 5431370, + "column543139": 814707.123, + "column543140": null, + "column543141": true, + "column543142": "value543142", + "column543143": 5431420, + "column543144": 814714.623, + "column543145": null, + "column543146": false, + "column543147": "value543147", + "column543148": 5431470, + "column543149": 814722.123, + "column543150": null, + "column543151": true, + "column543152": "value543152", + "column543153": 5431520, + "column543154": 814729.623, + "column543155": null, + "column543156": false, + "column543157": "value543157", + "column543158": 5431570, + "column543159": 814737.123, + "column543160": null, + "column543161": true, + "column543162": "value543162", + "column543163": 5431620, + "column543164": 814744.623, + "column543165": null, + "column543166": false, + "column543167": "value543167", + "column543168": 5431670, + "column543169": 814752.123, + "column543170": null, + "column543171": true, + "column543172": "value543172", + "column543173": 5431720, + "column543174": 814759.623, + "column543175": null, + "column543176": false, + "column543177": "value543177", + "column543178": 5431770, + "column543179": 814767.123, + "column543180": null, + "column543181": true, + "column543182": "value543182", + "column543183": 5431820, + "column543184": 814774.623, + "column543185": null, + "column543186": false, + "column543187": "value543187", + "column543188": 5431870, + "column543189": 814782.123, + "column543190": null, + "column543191": true, + "column543192": "value543192", + "column543193": 5431920, + "column543194": 814789.623, + "column543195": null, + "column543196": false, + "column543197": "value543197", + "column543198": 5431970, + "column543199": 814797.123, + "column543200": null + } +); + +UPSERT INTO ds ( +{ + "id": "596", + "column595001": true, + "column595002": "value595002", + "column595003": 5950020, + "column595004": 892504.623, + "column595005": null, + "column595006": false, + "column595007": "value595007", + "column595008": 5950070, + "column595009": 892512.123, + "column595010": null, + "column595011": true, + "column595012": "value595012", + "column595013": 5950120, + "column595014": 892519.623, + "column595015": null, + "column595016": false, + "column595017": "value595017", + "column595018": 5950170, + "column595019": 892527.123, + "column595020": null, + "column595021": true, + "column595022": "value595022", + "column595023": 5950220, + "column595024": 892534.623, + "column595025": null, + "column595026": false, + "column595027": "value595027", + "column595028": 5950270, + "column595029": 892542.123, + "column595030": null, + "column595031": true, + "column595032": "value595032", + "column595033": 5950320, + "column595034": 892549.623, + "column595035": null, + "column595036": false, + "column595037": "value595037", + "column595038": 5950370, + "column595039": 892557.123, + "column595040": null, + "column595041": true, + "column595042": "value595042", + "column595043": 5950420, + "column595044": 892564.623, + "column595045": null, + "column595046": false, + "column595047": "value595047", + "column595048": 5950470, + "column595049": 892572.123, + "column595050": null, + "column595051": true, + "column595052": "value595052", + "column595053": 5950520, + "column595054": 892579.623, + "column595055": null, + "column595056": false, + "column595057": "value595057", + "column595058": 5950570, + "column595059": 892587.123, + "column595060": null, + "column595061": true, + "column595062": "value595062", + "column595063": 5950620, + "column595064": 892594.623, + "column595065": null, + "column595066": false, + "column595067": "value595067", + "column595068": 5950670, + "column595069": 892602.123, + "column595070": null, + "column595071": true, + "column595072": "value595072", + "column595073": 5950720, + "column595074": 892609.623, + "column595075": null, + "column595076": false, + "column595077": "value595077", + "column595078": 5950770, + "column595079": 892617.123, + "column595080": null, + "column595081": true, + "column595082": "value595082", + "column595083": 5950820, + "column595084": 892624.623, + "column595085": null, + "column595086": false, + "column595087": "value595087", + "column595088": 5950870, + "column595089": 892632.123, + "column595090": null, + "column595091": true, + "column595092": "value595092", + "column595093": 5950920, + "column595094": 892639.623, + "column595095": null, + "column595096": false, + "column595097": "value595097", + "column595098": 5950970, + "column595099": 892647.123, + "column595100": null, + "column595101": true, + "column595102": "value595102", + "column595103": 5951020, + "column595104": 892654.623, + "column595105": null, + "column595106": false, + "column595107": "value595107", + "column595108": 5951070, + "column595109": 892662.123, + "column595110": null, + "column595111": true, + "column595112": "value595112", + "column595113": 5951120, + "column595114": 892669.623, + "column595115": null, + "column595116": false, + "column595117": "value595117", + "column595118": 5951170, + "column595119": 892677.123, + "column595120": null, + "column595121": true, + "column595122": "value595122", + "column595123": 5951220, + "column595124": 892684.623, + "column595125": null, + "column595126": false, + "column595127": "value595127", + "column595128": 5951270, + "column595129": 892692.123, + "column595130": null, + "column595131": true, + "column595132": "value595132", + "column595133": 5951320, + "column595134": 892699.623, + "column595135": null, + "column595136": false, + "column595137": "value595137", + "column595138": 5951370, + "column595139": 892707.123, + "column595140": null, + "column595141": true, + "column595142": "value595142", + "column595143": 5951420, + "column595144": 892714.623, + "column595145": null, + "column595146": false, + "column595147": "value595147", + "column595148": 5951470, + "column595149": 892722.123, + "column595150": null, + "column595151": true, + "column595152": "value595152", + "column595153": 5951520, + "column595154": 892729.623, + "column595155": null, + "column595156": false, + "column595157": "value595157", + "column595158": 5951570, + "column595159": 892737.123, + "column595160": null, + "column595161": true, + "column595162": "value595162", + "column595163": 5951620, + "column595164": 892744.623, + "column595165": null, + "column595166": false, + "column595167": "value595167", + "column595168": 5951670, + "column595169": 892752.123, + "column595170": null, + "column595171": true, + "column595172": "value595172", + "column595173": 5951720, + "column595174": 892759.623, + "column595175": null, + "column595176": false, + "column595177": "value595177", + "column595178": 5951770, + "column595179": 892767.123, + "column595180": null, + "column595181": true, + "column595182": "value595182", + "column595183": 5951820, + "column595184": 892774.623, + "column595185": null, + "column595186": false, + "column595187": "value595187", + "column595188": 5951870, + "column595189": 892782.123, + "column595190": null, + "column595191": true, + "column595192": "value595192", + "column595193": 5951920, + "column595194": 892789.623, + "column595195": null, + "column595196": false, + "column595197": "value595197", + "column595198": 5951970, + "column595199": 892797.123, + "column595200": null + } +); + +UPSERT INTO ds ( + { + "id": "762", + "column761001": true, + "column761002": "value761002", + "column761003": 7610020, + "column761004": 1141504.623, + "column761005": null, + "column761006": false, + "column761007": "value761007", + "column761008": 7610070, + "column761009": 1141512.123, + "column761010": null, + "column761011": true, + "column761012": "value761012", + "column761013": 7610120, + "column761014": 1141519.623, + "column761015": null, + "column761016": false, + "column761017": "value761017", + "column761018": 7610170, + "column761019": 1141527.123, + "column761020": null, + "column761021": true, + "column761022": "value761022", + "column761023": 7610220, + "column761024": 1141534.623, + "column761025": null, + "column761026": false, + "column761027": "value761027", + "column761028": 7610270, + "column761029": 1141542.123, + "column761030": null, + "column761031": true, + "column761032": "value761032", + "column761033": 7610320, + "column761034": 1141549.623, + "column761035": null, + "column761036": false, + "column761037": "value761037", + "column761038": 7610370, + "column761039": 1141557.123, + "column761040": null, + "column761041": true, + "column761042": "value761042", + "column761043": 7610420, + "column761044": 1141564.623, + "column761045": null, + "column761046": false, + "column761047": "value761047", + "column761048": 7610470, + "column761049": 1141572.123, + "column761050": null, + "column761051": true, + "column761052": "value761052", + "column761053": 7610520, + "column761054": 1141579.623, + "column761055": null, + "column761056": false, + "column761057": "value761057", + "column761058": 7610570, + "column761059": 1141587.123, + "column761060": null, + "column761061": true, + "column761062": "value761062", + "column761063": 7610620, + "column761064": 1141594.623, + "column761065": null, + "column761066": false, + "column761067": "value761067", + "column761068": 7610670, + "column761069": 1141602.123, + "column761070": null, + "column761071": true, + "column761072": "value761072", + "column761073": 7610720, + "column761074": 1141609.623, + "column761075": null, + "column761076": false, + "column761077": "value761077", + "column761078": 7610770, + "column761079": 1141617.123, + "column761080": null, + "column761081": true, + "column761082": "value761082", + "column761083": 7610820, + "column761084": 1141624.623, + "column761085": null, + "column761086": false, + "column761087": "value761087", + "column761088": 7610870, + "column761089": 1141632.123, + "column761090": null, + "column761091": true, + "column761092": "value761092", + "column761093": 7610920, + "column761094": 1141639.623, + "column761095": null, + "column761096": false, + "column761097": "value761097", + "column761098": 7610970, + "column761099": 1141647.123, + "column761100": null, + "column761101": true, + "column761102": "value761102", + "column761103": 7611020, + "column761104": 1141654.623, + "column761105": null, + "column761106": false, + "column761107": "value761107", + "column761108": 7611070, + "column761109": 1141662.123, + "column761110": null, + "column761111": true, + "column761112": "value761112", + "column761113": 7611120, + "column761114": 1141669.623, + "column761115": null, + "column761116": false, + "column761117": "value761117", + "column761118": 7611170, + "column761119": 1141677.123, + "column761120": null, + "column761121": true, + "column761122": "value761122", + "column761123": 7611220, + "column761124": 1141684.623, + "column761125": null, + "column761126": false, + "column761127": "value761127", + "column761128": 7611270, + "column761129": 1141692.123, + "column761130": null, + "column761131": true, + "column761132": "value761132", + "column761133": 7611320, + "column761134": 1141699.623, + "column761135": null, + "column761136": false, + "column761137": "value761137", + "column761138": 7611370, + "column761139": 1141707.123, + "column761140": null, + "column761141": true, + "column761142": "value761142", + "column761143": 7611420, + "column761144": 1141714.623, + "column761145": null, + "column761146": false, + "column761147": "value761147", + "column761148": 7611470, + "column761149": 1141722.123, + "column761150": null, + "column761151": true, + "column761152": "value761152", + "column761153": 7611520, + "column761154": 1141729.623, + "column761155": null, + "column761156": false, + "column761157": "value761157", + "column761158": 7611570, + "column761159": 1141737.123, + "column761160": null, + "column761161": true, + "column761162": "value761162", + "column761163": 7611620, + "column761164": 1141744.623, + "column761165": null, + "column761166": false, + "column761167": "value761167", + "column761168": 7611670, + "column761169": 1141752.123, + "column761170": null, + "column761171": true, + "column761172": "value761172", + "column761173": 7611720, + "column761174": 1141759.623, + "column761175": null, + "column761176": false, + "column761177": "value761177", + "column761178": 7611770, + "column761179": 1141767.123, + "column761180": null, + "column761181": true, + "column761182": "value761182", + "column761183": 7611820, + "column761184": 1141774.623, + "column761185": null, + "column761186": false, + "column761187": "value761187", + "column761188": 7611870, + "column761189": 1141782.123, + "column761190": null, + "column761191": true, + "column761192": "value761192", + "column761193": 7611920, + "column761194": 1141789.623, + "column761195": null, + "column761196": false, + "column761197": "value761197", + "column761198": 7611970, + "column761199": 1141797.123, + "column761200": null + } +); + +UPSERT INTO ds ( +{ + "id": "846", + "column845001": true, + "column845002": "value845002", + "column845003": 8450020, + "column845004": 1267504.623, + "column845005": null, + "column845006": false, + "column845007": "value845007", + "column845008": 8450070, + "column845009": 1267512.123, + "column845010": null, + "column845011": true, + "column845012": "value845012", + "column845013": 8450120, + "column845014": 1267519.623, + "column845015": null, + "column845016": false, + "column845017": "value845017", + "column845018": 8450170, + "column845019": 1267527.123, + "column845020": null, + "column845021": true, + "column845022": "value845022", + "column845023": 8450220, + "column845024": 1267534.623, + "column845025": null, + "column845026": false, + "column845027": "value845027", + "column845028": 8450270, + "column845029": 1267542.123, + "column845030": null, + "column845031": true, + "column845032": "value845032", + "column845033": 8450320, + "column845034": 1267549.623, + "column845035": null, + "column845036": false, + "column845037": "value845037", + "column845038": 8450370, + "column845039": 1267557.123, + "column845040": null, + "column845041": true, + "column845042": "value845042", + "column845043": 8450420, + "column845044": 1267564.623, + "column845045": null, + "column845046": false, + "column845047": "value845047", + "column845048": 8450470, + "column845049": 1267572.123, + "column845050": null, + "column845051": true, + "column845052": "value845052", + "column845053": 8450520, + "column845054": 1267579.623, + "column845055": null, + "column845056": false, + "column845057": "value845057", + "column845058": 8450570, + "column845059": 1267587.123, + "column845060": null, + "column845061": true, + "column845062": "value845062", + "column845063": 8450620, + "column845064": 1267594.623, + "column845065": null, + "column845066": false, + "column845067": "value845067", + "column845068": 8450670, + "column845069": 1267602.123, + "column845070": null, + "column845071": true, + "column845072": "value845072", + "column845073": 8450720, + "column845074": 1267609.623, + "column845075": null, + "column845076": false, + "column845077": "value845077", + "column845078": 8450770, + "column845079": 1267617.123, + "column845080": null, + "column845081": true, + "column845082": "value845082", + "column845083": 8450820, + "column845084": 1267624.623, + "column845085": null, + "column845086": false, + "column845087": "value845087", + "column845088": 8450870, + "column845089": 1267632.123, + "column845090": null, + "column845091": true, + "column845092": "value845092", + "column845093": 8450920, + "column845094": 1267639.623, + "column845095": null, + "column845096": false, + "column845097": "value845097", + "column845098": 8450970, + "column845099": 1267647.123, + "column845100": null, + "column845101": true, + "column845102": "value845102", + "column845103": 8451020, + "column845104": 1267654.623, + "column845105": null, + "column845106": false, + "column845107": "value845107", + "column845108": 8451070, + "column845109": 1267662.123, + "column845110": null, + "column845111": true, + "column845112": "value845112", + "column845113": 8451120, + "column845114": 1267669.623, + "column845115": null, + "column845116": false, + "column845117": "value845117", + "column845118": 8451170, + "column845119": 1267677.123, + "column845120": null, + "column845121": true, + "column845122": "value845122", + "column845123": 8451220, + "column845124": 1267684.623, + "column845125": null, + "column845126": false, + "column845127": "value845127", + "column845128": 8451270, + "column845129": 1267692.123, + "column845130": null, + "column845131": true, + "column845132": "value845132", + "column845133": 8451320, + "column845134": 1267699.623, + "column845135": null, + "column845136": false, + "column845137": "value845137", + "column845138": 8451370, + "column845139": 1267707.123, + "column845140": null, + "column845141": true, + "column845142": "value845142", + "column845143": 8451420, + "column845144": 1267714.623, + "column845145": null, + "column845146": false, + "column845147": "value845147", + "column845148": 8451470, + "column845149": 1267722.123, + "column845150": null, + "column845151": true, + "column845152": "value845152", + "column845153": 8451520, + "column845154": 1267729.623, + "column845155": null, + "column845156": false, + "column845157": "value845157", + "column845158": 8451570, + "column845159": 1267737.123, + "column845160": null, + "column845161": true, + "column845162": "value845162", + "column845163": 8451620, + "column845164": 1267744.623, + "column845165": null, + "column845166": false, + "column845167": "value845167", + "column845168": 8451670, + "column845169": 1267752.123, + "column845170": null, + "column845171": true, + "column845172": "value845172", + "column845173": 8451720, + "column845174": 1267759.623, + "column845175": null, + "column845176": false, + "column845177": "value845177", + "column845178": 8451770, + "column845179": 1267767.123, + "column845180": null, + "column845181": true, + "column845182": "value845182", + "column845183": 8451820, + "column845184": 1267774.623, + "column845185": null, + "column845186": false, + "column845187": "value845187", + "column845188": 8451870, + "column845189": 1267782.123, + "column845190": null, + "column845191": true, + "column845192": "value845192", + "column845193": 8451920, + "column845194": 1267789.623, + "column845195": null, + "column845196": false, + "column845197": "value845197", + "column845198": 8451970, + "column845199": 1267797.123, + "column845200": null + } +); + +UPSERT INTO ds ( +{ + "id": "935", + "column934001": true, + "column934002": "value934002", + "column934003": 9340020, + "column934004": 1401004.623, + "column934005": null, + "column934006": false, + "column934007": "value934007", + "column934008": 9340070, + "column934009": 1401012.123, + "column934010": null, + "column934011": true, + "column934012": "value934012", + "column934013": 9340120, + "column934014": 1401019.623, + "column934015": null, + "column934016": false, + "column934017": "value934017", + "column934018": 9340170, + "column934019": 1401027.123, + "column934020": null, + "column934021": true, + "column934022": "value934022", + "column934023": 9340220, + "column934024": 1401034.623, + "column934025": null, + "column934026": false, + "column934027": "value934027", + "column934028": 9340270, + "column934029": 1401042.123, + "column934030": null, + "column934031": true, + "column934032": "value934032", + "column934033": 9340320, + "column934034": 1401049.623, + "column934035": null, + "column934036": false, + "column934037": "value934037", + "column934038": 9340370, + "column934039": 1401057.123, + "column934040": null, + "column934041": true, + "column934042": "value934042", + "column934043": 9340420, + "column934044": 1401064.623, + "column934045": null, + "column934046": false, + "column934047": "value934047", + "column934048": 9340470, + "column934049": 1401072.123, + "column934050": null, + "column934051": true, + "column934052": "value934052", + "column934053": 9340520, + "column934054": 1401079.623, + "column934055": null, + "column934056": false, + "column934057": "value934057", + "column934058": 9340570, + "column934059": 1401087.123, + "column934060": null, + "column934061": true, + "column934062": "value934062", + "column934063": 9340620, + "column934064": 1401094.623, + "column934065": null, + "column934066": false, + "column934067": "value934067", + "column934068": 9340670, + "column934069": 1401102.123, + "column934070": null, + "column934071": true, + "column934072": "value934072", + "column934073": 9340720, + "column934074": 1401109.623, + "column934075": null, + "column934076": false, + "column934077": "value934077", + "column934078": 9340770, + "column934079": 1401117.123, + "column934080": null, + "column934081": true, + "column934082": "value934082", + "column934083": 9340820, + "column934084": 1401124.623, + "column934085": null, + "column934086": false, + "column934087": "value934087", + "column934088": 9340870, + "column934089": 1401132.123, + "column934090": null, + "column934091": true, + "column934092": "value934092", + "column934093": 9340920, + "column934094": 1401139.623, + "column934095": null, + "column934096": false, + "column934097": "value934097", + "column934098": 9340970, + "column934099": 1401147.123, + "column934100": null, + "column934101": true, + "column934102": "value934102", + "column934103": 9341020, + "column934104": 1401154.623, + "column934105": null, + "column934106": false, + "column934107": "value934107", + "column934108": 9341070, + "column934109": 1401162.123, + "column934110": null, + "column934111": true, + "column934112": "value934112", + "column934113": 9341120, + "column934114": 1401169.623, + "column934115": null, + "column934116": false, + "column934117": "value934117", + "column934118": 9341170, + "column934119": 1401177.123, + "column934120": null, + "column934121": true, + "column934122": "value934122", + "column934123": 9341220, + "column934124": 1401184.623, + "column934125": null, + "column934126": false, + "column934127": "value934127", + "column934128": 9341270, + "column934129": 1401192.123, + "column934130": null, + "column934131": true, + "column934132": "value934132", + "column934133": 9341320, + "column934134": 1401199.623, + "column934135": null, + "column934136": false, + "column934137": "value934137", + "column934138": 9341370, + "column934139": 1401207.123, + "column934140": null, + "column934141": true, + "column934142": "value934142", + "column934143": 9341420, + "column934144": 1401214.623, + "column934145": null, + "column934146": false, + "column934147": "value934147", + "column934148": 9341470, + "column934149": 1401222.123, + "column934150": null, + "column934151": true, + "column934152": "value934152", + "column934153": 9341520, + "column934154": 1401229.623, + "column934155": null, + "column934156": false, + "column934157": "value934157", + "column934158": 9341570, + "column934159": 1401237.123, + "column934160": null, + "column934161": true, + "column934162": "value934162", + "column934163": 9341620, + "column934164": 1401244.623, + "column934165": null, + "column934166": false, + "column934167": "value934167", + "column934168": 9341670, + "column934169": 1401252.123, + "column934170": null, + "column934171": true, + "column934172": "value934172", + "column934173": 9341720, + "column934174": 1401259.623, + "column934175": null, + "column934176": false, + "column934177": "value934177", + "column934178": 9341770, + "column934179": 1401267.123, + "column934180": null, + "column934181": true, + "column934182": "value934182", + "column934183": 9341820, + "column934184": 1401274.623, + "column934185": null, + "column934186": false, + "column934187": "value934187", + "column934188": 9341870, + "column934189": 1401282.123, + "column934190": null, + "column934191": true, + "column934192": "value934192", + "column934193": 9341920, + "column934194": 1401289.623, + "column934195": null, + "column934196": false, + "column934197": "value934197", + "column934198": 9341970, + "column934199": 1401297.123, + "column934200": null + } +); \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/io/merge/ASTERIXDB-3601/ASTERIXDB-3601.003.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/io/merge/ASTERIXDB-3601/ASTERIXDB-3601.003.query.sqlpp new file mode 100644 index 0000000000..b7d0d9c66a --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/column/io/merge/ASTERIXDB-3601/ASTERIXDB-3601.003.query.sqlpp @@ -0,0 +1,22 @@ +/* + * 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. + */ + +USE test; + +SELECT * FROM ds; \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/io/merge/ASTERIXDB-3601/ASTERIXDB-3601.003.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/io/merge/ASTERIXDB-3601/ASTERIXDB-3601.003.adm new file mode 100644 index 0000000000..f962c9c3b4 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/io/merge/ASTERIXDB-3601/ASTERIXDB-3601.003.adm @@ -0,0 +1,9 @@ +{ "ds": { "id": "190", "column189001": true, "column189002": "value189002", "column189003": 1890020, "column189004": 283504.623, "column189005": null, "column189006": false, "column189007": "value189007", "column189008": 1890070, "column189009": 283512.123, "column189010": null, "column189011": true, "column189012": "value189012", "column189013": 1890120, "column189014": 283519.623, "column189015": null, "column189016": false, "column189017": "value189017", "column189018": 1890170, "colu [...] +{ "ds": { "id": "204", "column203001": true, "column203002": "value203002", "column203003": 2030020, "column203004": 304504.623, "column203005": null, "column203006": false, "column203007": "value203007", "column203008": 2030070, "column203009": 304512.123, "column203010": null, "column203011": true, "column203012": "value203012", "column203013": 2030120, "column203014": 304519.623, "column203015": null, "column203016": false, "column203017": "value203017", "column203018": 2030170, "colu [...] +{ "ds": { "id": "23", "column22001": true, "column22002": "value22002", "column22003": 220020, "column22004": 33004.623, "column22005": null, "column22006": false, "column22007": "value22007", "column22008": 220070, "column22009": 33012.123, "column22010": null, "column22011": true, "column22012": "value22012", "column22013": 220120, "column22014": 33019.623, "column22015": null, "column22016": false, "column22017": "value22017", "column22018": 220170, "column22019": 33027.123, "column22 [...] +{ "ds": { "id": "490", "column489001": true, "column489002": "value489002", "column489003": 4890020, "column489004": 733504.623, "column489005": null, "column489006": false, "column489007": "value489007", "column489008": 4890070, "column489009": 733512.123, "column489010": null, "column489011": true, "column489012": "value489012", "column489013": 4890120, "column489014": 733519.623, "column489015": null, "column489016": false, "column489017": "value489017", "column489018": 4890170, "colu [...] +{ "ds": { "id": "544", "column543001": true, "column543002": "value543002", "column543003": 5430020, "column543004": 814504.623, "column543005": null, "column543006": false, "column543007": "value543007", "column543008": 5430070, "column543009": 814512.123, "column543010": null, "column543011": true, "column543012": "value543012", "column543013": 5430120, "column543014": 814519.623, "column543015": null, "column543016": false, "column543017": "value543017", "column543018": 5430170, "colu [...] +{ "ds": { "id": "596", "column595001": true, "column595002": "value595002", "column595003": 5950020, "column595004": 892504.623, "column595005": null, "column595006": false, "column595007": "value595007", "column595008": 5950070, "column595009": 892512.123, "column595010": null, "column595011": true, "column595012": "value595012", "column595013": 5950120, "column595014": 892519.623, "column595015": null, "column595016": false, "column595017": "value595017", "column595018": 5950170, "colu [...] +{ "ds": { "id": "762", "column761001": true, "column761002": "value761002", "column761003": 7610020, "column761004": 1141504.623, "column761005": null, "column761006": false, "column761007": "value761007", "column761008": 7610070, "column761009": 1141512.123, "column761010": null, "column761011": true, "column761012": "value761012", "column761013": 7610120, "column761014": 1141519.623, "column761015": null, "column761016": false, "column761017": "value761017", "column761018": 7610170, "c [...] +{ "ds": { "id": "846", "column845001": true, "column845002": "value845002", "column845003": 8450020, "column845004": 1267504.623, "column845005": null, "column845006": false, "column845007": "value845007", "column845008": 8450070, "column845009": 1267512.123, "column845010": null, "column845011": true, "column845012": "value845012", "column845013": 8450120, "column845014": 1267519.623, "column845015": null, "column845016": false, "column845017": "value845017", "column845018": 8450170, "c [...] +{ "ds": { "id": "935", "column934001": true, "column934002": "value934002", "column934003": 9340020, "column934004": 1401004.623, "column934005": null, "column934006": false, "column934007": "value934007", "column934008": 9340070, "column934009": 1401012.123, "column934010": null, "column934011": true, "column934012": "value934012", "column934013": 9340120, "column934014": 1401019.623, "column934015": null, "column934016": false, "column934017": "value934017", "column934018": 9340170, "c [...] diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_single_partition_sqlpp.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_single_partition_sqlpp.xml index 4a54ce9db1..5b230dada3 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_single_partition_sqlpp.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_single_partition_sqlpp.xml @@ -119,6 +119,11 @@ <output-dir compare="Text">io/merge/ASTERIXDB-3597</output-dir> </compilation-unit> </test-case> + <test-case FilePath="column"> + <compilation-unit name="io/merge/ASTERIXDB-3601"> + <output-dir compare="Text">io/merge/ASTERIXDB-3601</output-dir> + </compilation-unit> + </test-case> <test-case FilePath="column"> <compilation-unit name="delete/001"> <output-dir compare="Text">delete/001</output-dir> diff --git a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/MergeColumnTupleReference.java b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/MergeColumnTupleReference.java index eb12a27dc0..b14ea57976 100644 --- a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/MergeColumnTupleReference.java +++ b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/tuple/MergeColumnTupleReference.java @@ -92,6 +92,7 @@ public final class MergeColumnTupleReference extends AbstractAsterixColumnTupleR @Override public void newPage() throws HyracksDataException { super.newPage(); + frame.setPresentColumnsIndices(); // the tuples are being read, meanwhile MegaLeaf changed if (presentColumnIndexes != null) { frame.getAllColumns(presentColumnIndexes); diff --git a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/zero/readers/DefaultColumnPageZeroReader.java b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/zero/readers/DefaultColumnPageZeroReader.java index a60757eb4b..37aecde62c 100644 --- a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/zero/readers/DefaultColumnPageZeroReader.java +++ b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/zero/readers/DefaultColumnPageZeroReader.java @@ -198,6 +198,10 @@ public class DefaultColumnPageZeroReader implements IColumnPageZeroReader { // No-OP } + @Override + public void setPresentColumnsIndices() { + } + @Override public void printPageZeroReaderInfo() { ColumnarValueException ex = new ColumnarValueException(); diff --git a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/zero/readers/SparseColumnPageZeroReader.java b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/zero/readers/SparseColumnPageZeroReader.java index 0360352bd5..a008c79fa0 100644 --- a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/zero/readers/SparseColumnPageZeroReader.java +++ b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/zero/readers/SparseColumnPageZeroReader.java @@ -42,9 +42,6 @@ public class SparseColumnPageZeroReader extends DefaultColumnPageZeroReader { public void reset(ByteBuffer pageZeroBuf, ColumnProjectorType projectorType, int headerSize) { super.reset(pageZeroBuf, projectorType, headerSize); columnIndexToRelativeColumnIndex.clear(); - if (projectorType == ColumnProjectorType.MERGE) { - setPresentColumnsIndices(); - } } @Override @@ -52,9 +49,6 @@ public class SparseColumnPageZeroReader extends DefaultColumnPageZeroReader { int headerSize) { super.reset(pageZeroBuf, projectorType, numberOfPresentColumns, headerSize); columnIndexToRelativeColumnIndex.clear(); - if (projectorType == ColumnProjectorType.MERGE) { - setPresentColumnsIndices(); - } } @Override @@ -136,7 +130,8 @@ public class SparseColumnPageZeroReader extends DefaultColumnPageZeroReader { return relativeColumnIndex != -1; } - private void setPresentColumnsIndices() { + @Override + public void setPresentColumnsIndices() { presentColumnsIndices.clear(); if (numberOfPresentColumns == 0) { return; diff --git a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/zero/writers/multipage/DefaultColumnMultiPageZeroReader.java b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/zero/writers/multipage/DefaultColumnMultiPageZeroReader.java index 88c1b445e4..3623769402 100644 --- a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/zero/writers/multipage/DefaultColumnMultiPageZeroReader.java +++ b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/zero/writers/multipage/DefaultColumnMultiPageZeroReader.java @@ -282,6 +282,10 @@ public class DefaultColumnMultiPageZeroReader extends AbstractColumnMultiPageZer return pageZeroSegmentsPages; } + @Override + public void setPresentColumnsIndices() { + } + @Override public void unPinNotRequiredPageZeroSegments() throws HyracksDataException { segmentBuffers.unPinNotRequiredSegments(pageZeroSegmentsPages, numberOfPageZeroSegments); diff --git a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/zero/writers/multipage/SparseColumnMultiPageZeroReader.java b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/zero/writers/multipage/SparseColumnMultiPageZeroReader.java index d0d620db72..be47e2bfe1 100644 --- a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/zero/writers/multipage/SparseColumnMultiPageZeroReader.java +++ b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/zero/writers/multipage/SparseColumnMultiPageZeroReader.java @@ -88,10 +88,6 @@ public class SparseColumnMultiPageZeroReader extends AbstractColumnMultiPageZero zerothSegmentReader.reset(pageZeroBuf, projectorType, Math.min(numberOfColumnInZerothSegment, getNumberOfPresentColumns()), headerSize); columnIndexToRelativeColumnIndex.clear(); - if (projectorType == ColumnProjectorType.MERGE) { - //This Info is only required for the merge operation, hence we can skip it for the projection operation. - setPresentColumnsIndices(); - } } @Override @@ -282,7 +278,8 @@ public class SparseColumnMultiPageZeroReader extends AbstractColumnMultiPageZero return findRelativeColumnIndex(columnIndex) != -1; } - private void setPresentColumnsIndices() { + @Override + public void setPresentColumnsIndices() { presentColumnsIndices.clear(); int numberOfPresentColumns = getNumberOfPresentColumns(); if (numberOfPresentColumns == 0) { diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/btree/ColumnBTreeReadLeafFrame.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/btree/ColumnBTreeReadLeafFrame.java index bfd26d0be4..caa961941c 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/btree/ColumnBTreeReadLeafFrame.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/btree/ColumnBTreeReadLeafFrame.java @@ -200,4 +200,8 @@ public final class ColumnBTreeReadLeafFrame extends AbstractColumnBTreeLeafFrame public void printPageZeroReaderInfo() { columnPageZeroReader.printPageZeroReaderInfo(); } + + public void setPresentColumnsIndices() { + columnPageZeroReader.setPresentColumnsIndices(); + } } diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/btree/IColumnPageZeroReader.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/btree/IColumnPageZeroReader.java index 3f837a1d71..6219c03770 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/btree/IColumnPageZeroReader.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/btree/IColumnPageZeroReader.java @@ -80,4 +80,6 @@ public interface IColumnPageZeroReader { void printPageZeroReaderInfo(); void unPinNotRequiredPageZeroSegments() throws HyracksDataException; + + void setPresentColumnsIndices(); }