Repository: vxquery Updated Branches: refs/heads/master 39c4aca9b -> 43435f712
Fixed License issues Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/43435f71 Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/43435f71 Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/43435f71 Branch: refs/heads/master Commit: 43435f712307d2c88a22ca0c0604443ca03e1e44 Parents: 39c4aca Author: Steven Jacobs <[email protected]> Authored: Thu May 19 14:48:23 2016 -0700 Committer: Steven Jacobs <[email protected]> Committed: Thu May 19 14:48:23 2016 -0700 ---------------------------------------------------------------------- .rat-excludes | 1 + .../basex_index/sensors_database_add.bxs | 17 +++++++++++++++++ .../basex_index/sensors_database_remove.bxs | 17 +++++++++++++++++ .../basex_index/stations_database_add.bxs | 17 +++++++++++++++++ .../basex_index/stations_database_remove.bxs | 17 +++++++++++++++++ .../rewriter/rules/ConsolidateDescandantChild.java | 17 +++++++++++++++++ 6 files changed, 86 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/43435f71/.rat-excludes ---------------------------------------------------------------------- diff --git a/.rat-excludes b/.rat-excludes index 47ceedb..de2de17 100644 --- a/.rat-excludes +++ b/.rat-excludes @@ -4,3 +4,4 @@ .classpath ExpectedTestResults xqts.txt +.basex http://git-wip-us.apache.org/repos/asf/vxquery/blob/43435f71/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_add.bxs ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_add.bxs b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_add.bxs index b56f86a..8495822 100644 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_add.bxs +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_add.bxs @@ -1,2 +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. :) + CREATE DB db_sensors ADD /tmp/1.0_partition_ghcnd_all_xml/ http://git-wip-us.apache.org/repos/asf/vxquery/blob/43435f71/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_remove.bxs ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_remove.bxs b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_remove.bxs index f923fd4..f6d46d9 100644 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_remove.bxs +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/sensors_database_remove.bxs @@ -1 +1,18 @@ +(: 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 DB db_sensors http://git-wip-us.apache.org/repos/asf/vxquery/blob/43435f71/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_add.bxs ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_add.bxs b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_add.bxs index cb1ea21..abc640e 100644 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_add.bxs +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_add.bxs @@ -1,2 +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. :) + CREATE DB db_stations ADD ../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/stations/ http://git-wip-us.apache.org/repos/asf/vxquery/blob/43435f71/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_remove.bxs ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_remove.bxs b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_remove.bxs index 33b9722..c54237d 100644 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_remove.bxs +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/basex_index/stations_database_remove.bxs @@ -1 +1,18 @@ +(: 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 DB db_stations http://git-wip-us.apache.org/repos/asf/vxquery/blob/43435f71/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateDescandantChild.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateDescandantChild.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateDescandantChild.java index 8f244ef..8554012 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateDescandantChild.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/ConsolidateDescandantChild.java @@ -1,3 +1,20 @@ +/* + * 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. + */ + package org.apache.vxquery.compiler.rewriter.rules; import java.util.List;
