You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2014/11/18 10:56:27 UTC
[1/2] incubator-calcite git commit: Add headers, to appease the RAT.
Repository: incubator-calcite
Updated Branches:
refs/heads/master 71dd68de1 -> e415f35d5
Add headers, to appease the RAT.
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/1bbb106c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/1bbb106c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/1bbb106c
Branch: refs/heads/master
Commit: 1bbb106c49a1f097ce91412194d891a5da468191
Parents: 71dd68d
Author: Julian Hyde <jh...@apache.org>
Authored: Tue Nov 18 00:08:10 2014 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Tue Nov 18 00:30:38 2014 -0800
----------------------------------------------------------------------
example/csv/src/test/resources/bug.json | 16 +++++++++++
.../src/test/resources/filterable-model.json | 23 ++++++++++++++--
.../test/resources/model-with-custom-table.json | 16 +++++++++++
.../csv/src/test/resources/model-with-view.json | 18 ++++++++++++
example/csv/src/test/resources/model.json | 18 ++++++++++++
example/csv/src/test/resources/smart.json | 29 +++++++++++++++++---
linq4j/pom.xml | 17 ++++++++++++
pom.xml | 2 ++
8 files changed, 132 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/1bbb106c/example/csv/src/test/resources/bug.json
----------------------------------------------------------------------
diff --git a/example/csv/src/test/resources/bug.json b/example/csv/src/test/resources/bug.json
index 1b28466..1b4fece 100644
--- a/example/csv/src/test/resources/bug.json
+++ b/example/csv/src/test/resources/bug.json
@@ -1,3 +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.
+ */
{
version: '1.0',
defaultSchema: 'BUG',
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/1bbb106c/example/csv/src/test/resources/filterable-model.json
----------------------------------------------------------------------
diff --git a/example/csv/src/test/resources/filterable-model.json b/example/csv/src/test/resources/filterable-model.json
index f632d16..e53fd32 100644
--- a/example/csv/src/test/resources/filterable-model.json
+++ b/example/csv/src/test/resources/filterable-model.json
@@ -1,6 +1,23 @@
-/* A JSON model of a Calcite schema that is similar to model.json,
- except that it produces tables that implement FilterableTable.
- These tables can implement their own simple filtering. */
+/*
+ * 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.
+ *
+ * A JSON model of a Calcite schema that is similar to model.json,
+ * except that it produces tables that implement FilterableTable.
+ * These tables can implement their own simple filtering.
+ */
{
version: '1.0',
defaultSchema: 'SALES',
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/1bbb106c/example/csv/src/test/resources/model-with-custom-table.json
----------------------------------------------------------------------
diff --git a/example/csv/src/test/resources/model-with-custom-table.json b/example/csv/src/test/resources/model-with-custom-table.json
index ccc7615..28d5b38 100644
--- a/example/csv/src/test/resources/model-with-custom-table.json
+++ b/example/csv/src/test/resources/model-with-custom-table.json
@@ -1,3 +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.
+ */
{
version: '1.0',
defaultSchema: 'CUSTOM_TABLE',
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/1bbb106c/example/csv/src/test/resources/model-with-view.json
----------------------------------------------------------------------
diff --git a/example/csv/src/test/resources/model-with-view.json b/example/csv/src/test/resources/model-with-view.json
index dae0a2d..11d8058 100644
--- a/example/csv/src/test/resources/model-with-view.json
+++ b/example/csv/src/test/resources/model-with-view.json
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ * A JSON model of a Calcite schema that includes a view.
+ */
{
version: '1.0',
defaultSchema: 'SALES',
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/1bbb106c/example/csv/src/test/resources/model.json
----------------------------------------------------------------------
diff --git a/example/csv/src/test/resources/model.json b/example/csv/src/test/resources/model.json
index 50b1b95..60431a8 100644
--- a/example/csv/src/test/resources/model.json
+++ b/example/csv/src/test/resources/model.json
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ *
+ * A JSON model of a simple Calcite schema.
+ */
{
version: '1.0',
defaultSchema: 'SALES',
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/1bbb106c/example/csv/src/test/resources/smart.json
----------------------------------------------------------------------
diff --git a/example/csv/src/test/resources/smart.json b/example/csv/src/test/resources/smart.json
index d6ec5bf..b948259 100644
--- a/example/csv/src/test/resources/smart.json
+++ b/example/csv/src/test/resources/smart.json
@@ -1,7 +1,28 @@
-/* A JSON model of a Calcite schema that is similar to model.json,
- except that it produces tables that implement
- TranslatableTable. These tables are translated to a CsvTableScan
- relational expression which participates in query planning. */
+/*
+ * 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.
+ *
+ * A JSON model of a Calcite schema that is similar to model.json,
+ * except that it produces tables that implement FilterableTable.
+ * These tables can implement their own simple filtering.
+ *
+ * A JSON model of a Calcite schema that is similar to model.json,
+ * except that it produces tables that implement
+ * TranslatableTable. These tables are translated to a CsvTableScan
+ * relational expression which participates in query planning.
+ */
{
version: '1.0',
defaultSchema: 'SALES',
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/1bbb106c/linq4j/pom.xml
----------------------------------------------------------------------
diff --git a/linq4j/pom.xml b/linq4j/pom.xml
index a9aca65..b97f53a 100644
--- a/linq4j/pom.xml
+++ b/linq4j/pom.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/1bbb106c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 904d9f1..f351ad5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -500,6 +500,8 @@ limitations under the License.
<exclude>*.md</exclude>
<exclude>doc/*.md</exclude>
<exclude>src/main/resources/META-INF/services/java.sql.Driver</exclude>
+ <exclude>**/src/test/resources/**/*.csv</exclude>
+ <exclude>**/src/test/resources/bug/archers.json</exclude>
</excludes>
</configuration>
<executions>
[2/2] incubator-calcite git commit: [CALCITE-467] Incorrect namespace
in package-info.java
Posted by jh...@apache.org.
[CALCITE-467] Incorrect namespace in package-info.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/e415f35d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/e415f35d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/e415f35d
Branch: refs/heads/master
Commit: e415f35d55a8c8a50e798f317d3a37c9139c0d45
Parents: 1bbb106
Author: Andrew <an...@primer.org>
Authored: Tue Nov 18 01:08:10 2014 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Tue Nov 18 01:08:10 2014 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/calcite/interpreter/package-info.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/e415f35d/core/src/main/java/org/apache/calcite/interpreter/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/interpreter/package-info.java b/core/src/main/java/org/apache/calcite/interpreter/package-info.java
index a0117ce..c2e152f 100644
--- a/core/src/main/java/org/apache/calcite/interpreter/package-info.java
+++ b/core/src/main/java/org/apache/calcite/interpreter/package-info.java
@@ -22,6 +22,6 @@
* preparation time is less, and so the total prepare + execute time is
* competitive for queries over small data sets.
*/
-package org.apache.calcite.adapter.interpreter;
+package org.apache.calcite.interpreter;
// End package-info.java