Repository: kylin Updated Branches: refs/heads/2.0-rc 543ef7e06 -> fbed0543e
KYLIN-1286 fix license file headers Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/fbed0543 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/fbed0543 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/fbed0543 Branch: refs/heads/2.0-rc Commit: fbed0543e7a72127cca050d6a110fd8ece794be9 Parents: 543ef7e Author: Yang Li <[email protected]> Authored: Tue Feb 9 09:08:02 2016 +0800 Committer: Yang Li <[email protected]> Committed: Tue Feb 9 09:08:02 2016 +0800 ---------------------------------------------------------------------- KEYS | 57 ++++++++++++++++++++ assembly/pom.xml | 18 +++++++ .../.settings/org.eclipse.core.resources.prefs | 1 + core-cube/src/main/assembly/assemble.xml | 19 ------- core-metadata/src/main/assembly/assemble.xml | 21 -------- engine-spark/pom.xml | 18 +++++++ engine-streaming/pom.xml | 18 +++++++ .../test/resources/query/sql_cache/query01.sql | 18 +++++++ .../test/resources/query/sql_cache/query02.sql | 18 +++++++ .../test/resources/query/sql_cache/query03.sql | 18 +++++++ .../test/resources/query/sql_cache/query04.sql | 18 +++++++ .../test/resources/query/sql_cache/query05.sql | 18 +++++++ .../test/resources/query/sql_cache/query06.sql | 18 +++++++ .../test/resources/query/sql_cache/query07.sql | 18 +++++++ .../test/resources/query/sql_cache/query08.sql | 18 +++++++ .../test/resources/query/sql_cache/query09.sql | 18 +++++++ .../resources/query/sql_streaming/query01.sql | 18 +++++++ .../resources/query/sql_streaming/query02.sql | 18 +++++++ .../resources/query/sql_streaming/query03.sql | 18 +++++++ .../resources/query/sql_streaming/query04.sql | 18 +++++++ .../resources/query/sql_streaming/query05.sql | 18 +++++++ .../resources/query/sql_streaming/query06.sql | 18 +++++++ .../resources/query/sql_streaming/query07.sql | 18 +++++++ .../resources/query/sql_streaming/query08.sql | 18 +++++++ .../resources/query/sql_streaming/query09.sql | 18 +++++++ .../resources/query/sql_streaming/query10.sql | 18 +++++++ pom.xml | 22 +++----- .../src/main/resources/applicationContext.xml | 14 +++++ server/src/main/resources/ehcache-test.xml | 14 +++++ server/src/main/resources/ehcache.xml | 14 +++++ server/src/main/resources/kylinSecurity.xml | 14 +++++ .../src/main/webapp/WEB-INF/kylin-servlet.xml | 14 +++++ server/src/main/webapp/WEB-INF/web.xml | 14 +++++ server/src/main/webapp/index.html | 14 +++++ source-kafka/pom.xml | 18 +++++++ storage-hbase/pom.xml | 7 ++- .../cube/v1/filter/protobuf/FilterExt.proto | 18 +++++++ .../endpoint/protobuf/CubeVisit.proto | 18 +++++++ .../ii/coprocessor/endpoint/protobuf/II.proto | 18 +++++++ 39 files changed, 637 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/KEYS ---------------------------------------------------------------------- diff --git a/KEYS b/KEYS index d5dedb6..dced41a 100644 --- a/KEYS +++ b/KEYS @@ -71,3 +71,60 @@ EBG4pxGI2XsApbts0AkkINEYAKN+Z/o9BtrpEvodFPn2TBR3D9zPM+XiSZXTZ/gG zJ5Mba6u6w6DZa238CtPdRTMh5ZAGhgkWYCrpQJ+CD9qflqNFzpTQ4FtPg8= =YeBe -----END PGP PUBLIC KEY BLOCK----- +pub 4096R/80181F78 2016-02-08 +uid Li Yang <[email protected]> +sig 3 80181F78 2016-02-08 Li Yang <[email protected]> +sub 4096R/31F92352 2016-02-08 +sig 80181F78 2016-02-08 Li Yang <[email protected]> + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +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 +=/uVI +-----END PGP PUBLIC KEY BLOCK----- http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index 2dfa566..102a930 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -1,4 +1,22 @@ <?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";> http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/core-cube/.settings/org.eclipse.core.resources.prefs ---------------------------------------------------------------------- diff --git a/core-cube/.settings/org.eclipse.core.resources.prefs b/core-cube/.settings/org.eclipse.core.resources.prefs index 365bbd6..04cfa2c 100644 --- a/core-cube/.settings/org.eclipse.core.resources.prefs +++ b/core-cube/.settings/org.eclipse.core.resources.prefs @@ -2,4 +2,5 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 encoding//src/main/resources=UTF-8 encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 encoding/<project>=UTF-8 http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/core-cube/src/main/assembly/assemble.xml ---------------------------------------------------------------------- diff --git a/core-cube/src/main/assembly/assemble.xml b/core-cube/src/main/assembly/assemble.xml deleted file mode 100644 index c26c222..0000000 --- a/core-cube/src/main/assembly/assemble.xml +++ /dev/null @@ -1,19 +0,0 @@ -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> - <id>jar-with-dependencies</id> - <formats> - <format>jar</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <dependencySets> - <dependencySet> - <outputDirectory>/</outputDirectory> - <useProjectArtifact>true</useProjectArtifact> - <unpack>true</unpack> - <scope>runtime</scope> - <excludes> - <exclude>javax.servlet*:*</exclude> - </excludes> - </dependencySet> - </dependencySets> -</assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/core-metadata/src/main/assembly/assemble.xml ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/assembly/assemble.xml b/core-metadata/src/main/assembly/assemble.xml deleted file mode 100644 index 0a3c323..0000000 --- a/core-metadata/src/main/assembly/assemble.xml +++ /dev/null @@ -1,21 +0,0 @@ -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> - <id>jar-with-dependencies</id> - <formats> - <format>jar</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <dependencySets> - <dependencySet> - <outputDirectory>/</outputDirectory> - <useProjectArtifact>true</useProjectArtifact> - <unpack>true</unpack> - <scope>runtime</scope> - <excludes> - <!--<exclude>com.google.guava:guava</exclude> - <exclude>org.codehaus.jackson:*</exclude> --> - </excludes> - </dependencySet> - </dependencySets> -</assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/engine-spark/pom.xml ---------------------------------------------------------------------- diff --git a/engine-spark/pom.xml b/engine-spark/pom.xml index e9bfab3..a35fee0 100644 --- a/engine-spark/pom.xml +++ b/engine-spark/pom.xml @@ -1,4 +1,22 @@ <?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";> http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/engine-streaming/pom.xml ---------------------------------------------------------------------- diff --git a/engine-streaming/pom.xml b/engine-streaming/pom.xml index a30b552..6dfbf6a 100644 --- a/engine-streaming/pom.xml +++ b/engine-streaming/pom.xml @@ -1,4 +1,22 @@ <?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";> http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/kylin-it/src/test/resources/query/sql_cache/query01.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_cache/query01.sql b/kylin-it/src/test/resources/query/sql_cache/query01.sql index 308a5f3..e6b601b 100644 --- a/kylin-it/src/test/resources/query/sql_cache/query01.sql +++ b/kylin-it/src/test/resources/query/sql_cache/query01.sql @@ -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. +-- + select test_kylin_fact.lstg_format_name, test_kylin_fact.cal_dt,sum(test_kylin_fact.price) as GMV , count(*) as TRANS_CNT from test_kylin_fact http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/kylin-it/src/test/resources/query/sql_cache/query02.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_cache/query02.sql b/kylin-it/src/test/resources/query/sql_cache/query02.sql index ae1a933..1cee410 100644 --- a/kylin-it/src/test/resources/query/sql_cache/query02.sql +++ b/kylin-it/src/test/resources/query/sql_cache/query02.sql @@ -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. +-- + select test_kylin_fact.lstg_format_name, test_kylin_fact.cal_dt,sum(test_kylin_fact.price) as GMV , count(*) as TRANS_CNT from test_kylin_fact http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/kylin-it/src/test/resources/query/sql_cache/query03.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_cache/query03.sql b/kylin-it/src/test/resources/query/sql_cache/query03.sql index 421bde4..d311df7 100644 --- a/kylin-it/src/test/resources/query/sql_cache/query03.sql +++ b/kylin-it/src/test/resources/query/sql_cache/query03.sql @@ -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. +-- + select test_kylin_fact.lstg_format_name, test_kylin_fact.cal_dt,sum(test_kylin_fact.price) as GMV , count(*) as TRANS_CNT from test_kylin_fact http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/kylin-it/src/test/resources/query/sql_cache/query04.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_cache/query04.sql b/kylin-it/src/test/resources/query/sql_cache/query04.sql index c875e80..4db7a36 100644 --- a/kylin-it/src/test/resources/query/sql_cache/query04.sql +++ b/kylin-it/src/test/resources/query/sql_cache/query04.sql @@ -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. +-- + select test_kylin_fact.lstg_format_name, test_kylin_fact.cal_dt,sum(test_kylin_fact.price) as GMV , count(*) as TRANS_CNT from test_kylin_fact http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/kylin-it/src/test/resources/query/sql_cache/query05.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_cache/query05.sql b/kylin-it/src/test/resources/query/sql_cache/query05.sql index 2b5ff24..943c93a 100644 --- a/kylin-it/src/test/resources/query/sql_cache/query05.sql +++ b/kylin-it/src/test/resources/query/sql_cache/query05.sql @@ -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. +-- + select test_kylin_fact.lstg_format_name, test_kylin_fact.cal_dt,sum(test_kylin_fact.price) as GMV , count(*) as TRANS_CNT from test_kylin_fact http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/kylin-it/src/test/resources/query/sql_cache/query06.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_cache/query06.sql b/kylin-it/src/test/resources/query/sql_cache/query06.sql index e1bee95..5d8b974 100644 --- a/kylin-it/src/test/resources/query/sql_cache/query06.sql +++ b/kylin-it/src/test/resources/query/sql_cache/query06.sql @@ -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. +-- + select test_kylin_fact.lstg_format_name, test_kylin_fact.cal_dt,sum(test_kylin_fact.price) as GMV , count(*) as TRANS_CNT from test_kylin_fact http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/kylin-it/src/test/resources/query/sql_cache/query07.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_cache/query07.sql b/kylin-it/src/test/resources/query/sql_cache/query07.sql index b9e2821..1b1543c 100644 --- a/kylin-it/src/test/resources/query/sql_cache/query07.sql +++ b/kylin-it/src/test/resources/query/sql_cache/query07.sql @@ -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. +-- + select test_kylin_fact.lstg_format_name, test_kylin_fact.cal_dt,sum(test_kylin_fact.price) as GMV , count(*) as TRANS_CNT from test_kylin_fact http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/kylin-it/src/test/resources/query/sql_cache/query08.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_cache/query08.sql b/kylin-it/src/test/resources/query/sql_cache/query08.sql index 308a5f3..e6b601b 100644 --- a/kylin-it/src/test/resources/query/sql_cache/query08.sql +++ b/kylin-it/src/test/resources/query/sql_cache/query08.sql @@ -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. +-- + select test_kylin_fact.lstg_format_name, test_kylin_fact.cal_dt,sum(test_kylin_fact.price) as GMV , count(*) as TRANS_CNT from test_kylin_fact http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/kylin-it/src/test/resources/query/sql_cache/query09.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_cache/query09.sql b/kylin-it/src/test/resources/query/sql_cache/query09.sql index b9e2821..1b1543c 100644 --- a/kylin-it/src/test/resources/query/sql_cache/query09.sql +++ b/kylin-it/src/test/resources/query/sql_cache/query09.sql @@ -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. +-- + select test_kylin_fact.lstg_format_name, test_kylin_fact.cal_dt,sum(test_kylin_fact.price) as GMV , count(*) as TRANS_CNT from test_kylin_fact http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/kylin-it/src/test/resources/query/sql_streaming/query01.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_streaming/query01.sql b/kylin-it/src/test/resources/query/sql_streaming/query01.sql index 8a5f302..0d47167 100644 --- a/kylin-it/src/test/resources/query/sql_streaming/query01.sql +++ b/kylin-it/src/test/resources/query/sql_streaming/query01.sql @@ -1 +1,19 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- + select count(*) AS c from streaming_table \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/kylin-it/src/test/resources/query/sql_streaming/query02.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_streaming/query02.sql b/kylin-it/src/test/resources/query/sql_streaming/query02.sql index 0fc0f88..5ac61ea 100644 --- a/kylin-it/src/test/resources/query/sql_streaming/query02.sql +++ b/kylin-it/src/test/resources/query/sql_streaming/query02.sql @@ -1 +1,19 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- + select count(*) AS c ,cast(sum(item_count) as BIGINT) as i from streaming_table group by site,day_start \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/kylin-it/src/test/resources/query/sql_streaming/query03.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_streaming/query03.sql b/kylin-it/src/test/resources/query/sql_streaming/query03.sql index 33ab8cb..2dce564 100644 --- a/kylin-it/src/test/resources/query/sql_streaming/query03.sql +++ b/kylin-it/src/test/resources/query/sql_streaming/query03.sql @@ -1 +1,19 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- + select count(*) as c ,hour_start AS h from streaming_table group by hour_start \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/kylin-it/src/test/resources/query/sql_streaming/query04.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_streaming/query04.sql b/kylin-it/src/test/resources/query/sql_streaming/query04.sql index 5117c37..37ea755 100644 --- a/kylin-it/src/test/resources/query/sql_streaming/query04.sql +++ b/kylin-it/src/test/resources/query/sql_streaming/query04.sql @@ -1 +1,19 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- + select count(*) as c,sum(gmv) as g,cast(sum(item_count) as BIGINT) AS i from streaming_table group by minute_start \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/kylin-it/src/test/resources/query/sql_streaming/query05.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_streaming/query05.sql b/kylin-it/src/test/resources/query/sql_streaming/query05.sql index 566046a..ae8b714 100644 --- a/kylin-it/src/test/resources/query/sql_streaming/query05.sql +++ b/kylin-it/src/test/resources/query/sql_streaming/query05.sql @@ -1 +1,19 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- + select count(*) as c from streaming_table where day_start >= DATE'2015-01-02' \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/kylin-it/src/test/resources/query/sql_streaming/query06.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_streaming/query06.sql b/kylin-it/src/test/resources/query/sql_streaming/query06.sql index ceabc91..009297c 100644 --- a/kylin-it/src/test/resources/query/sql_streaming/query06.sql +++ b/kylin-it/src/test/resources/query/sql_streaming/query06.sql @@ -1 +1,19 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- + select count(*) as c from streaming_table where minute_start >= {TS '2015-01-02 20:00:00'} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/kylin-it/src/test/resources/query/sql_streaming/query07.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_streaming/query07.sql b/kylin-it/src/test/resources/query/sql_streaming/query07.sql index b09759d..a9f97d7 100644 --- a/kylin-it/src/test/resources/query/sql_streaming/query07.sql +++ b/kylin-it/src/test/resources/query/sql_streaming/query07.sql @@ -1 +1,19 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- + select count(*) as c from streaming_table where minute_start < {TS '2015-01-02 21:00:00'} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/kylin-it/src/test/resources/query/sql_streaming/query08.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_streaming/query08.sql b/kylin-it/src/test/resources/query/sql_streaming/query08.sql index 120ef50..f456cf1 100644 --- a/kylin-it/src/test/resources/query/sql_streaming/query08.sql +++ b/kylin-it/src/test/resources/query/sql_streaming/query08.sql @@ -1 +1,19 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- + select count(*) as c from streaming_table where minute_start < {TS '2015-01-02 21:00:00'} and minute_start > {TS '2015-01-02 20:00:00'} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/kylin-it/src/test/resources/query/sql_streaming/query09.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_streaming/query09.sql b/kylin-it/src/test/resources/query/sql_streaming/query09.sql index 0d29d92..34bfa0f 100644 --- a/kylin-it/src/test/resources/query/sql_streaming/query09.sql +++ b/kylin-it/src/test/resources/query/sql_streaming/query09.sql @@ -1 +1,19 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- + select count(*) as c from streaming_table where minute_start >= {TS '2015-01-02 20:30:00'} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/kylin-it/src/test/resources/query/sql_streaming/query10.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_streaming/query10.sql b/kylin-it/src/test/resources/query/sql_streaming/query10.sql index c92add2..7758b74 100644 --- a/kylin-it/src/test/resources/query/sql_streaming/query10.sql +++ b/kylin-it/src/test/resources/query/sql_streaming/query10.sql @@ -1 +1,19 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- + select count(*) as c from streaming_table where minute_start >= {TS '2015-01-01 20:30:00'} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9900327..9d9a54b 100644 --- a/pom.xml +++ b/pom.xml @@ -731,21 +731,20 @@ <exclude>**/*.gif</exclude> <exclude>**/*.ico</exclude> - <exclude>server/logs**</exclude> - - <!--Job's Test Data--> + <!--Test Data--> <exclude>**/src/test/resources/**</exclude> <!-- generated files --> <exclude>**/target/**</exclude> <exclude>lib/**</exclude> <exclude>dist/**</exclude> - <exclude>website/**</exclude> + <!-- text files without comments --> <exclude>**/*.csv</exclude> <exclude>**/*.json</exclude> <exclude>**/*.md</exclude> + <!-- binary files --> <exclude>**/*.dict</exclude> <exclude>**/*.dic</exclude> @@ -753,17 +752,15 @@ <exclude>**/*.pdf</exclude> <exclude>**/*.docx</exclude> <exclude>**/*.doc</exclude> - <exclude>**/*.log</exclude> <exclude>**/*.txt</exclude> - <exclude>**/.checkstyle</exclude> - <!--Job's Test Data--> - <exclude>**/src/test/resources/data/**</exclude> + <!-- Kylin's website content --> <exclude>**/.sass-cache/**</exclude> <!-- tomcat package --> <exclude>tomcat/**</exclude> + <!-- front end libary and generated files --> <exclude>webapp/node_modules/**</exclude> <exclude>webapp/dist/**</exclude> @@ -784,15 +781,11 @@ <exclude>webapp/grunt.json</exclude> <exclude>webapp/package.json</exclude> - <!-- jdbc log --> + <!-- logs --> + <exclude>**/*.log</exclude> <exclude>jdbc/kylin_jdbc.log*</exclude> - <!-- server log --> <exclude>server/logs/**</exclude> - <!-- HBase MiniCluster Testing Data, for testing only --> - <exclude>examples/test_case_data/minicluster/hbase-export.tar.gz</exclude> - <exclude>examples/test_case_data/**/*.xml</exclude> - <!--ODBC sub project is a VS project, exclude related files --> <exclude>**/*.sln</exclude> <exclude>**/*.vcxproj</exclude> @@ -832,6 +825,7 @@ <plugin> <groupId>net.ju-n.maven.plugins</groupId> <artifactId>checksum-maven-plugin</artifactId> + <version>1.2</version> <executions> <execution> <goals> http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/server/src/main/resources/applicationContext.xml ---------------------------------------------------------------------- diff --git a/server/src/main/resources/applicationContext.xml b/server/src/main/resources/applicationContext.xml index dd66070..d7a93b9 100644 --- a/server/src/main/resources/applicationContext.xml +++ b/server/src/main/resources/applicationContext.xml @@ -1,3 +1,17 @@ +<!-- + Licensed 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. See accompanying LICENSE file. +--> + <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:context="http://www.springframework.org/schema/context"; http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/server/src/main/resources/ehcache-test.xml ---------------------------------------------------------------------- diff --git a/server/src/main/resources/ehcache-test.xml b/server/src/main/resources/ehcache-test.xml index 7cae6ce..eb39774 100644 --- a/server/src/main/resources/ehcache-test.xml +++ b/server/src/main/resources/ehcache-test.xml @@ -1,3 +1,17 @@ +<!-- + Licensed 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. See accompanying LICENSE file. +--> + <ehcache maxBytesLocalHeap="10M">> <cache name="StorageCache" eternal="false" http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/server/src/main/resources/ehcache.xml ---------------------------------------------------------------------- diff --git a/server/src/main/resources/ehcache.xml b/server/src/main/resources/ehcache.xml index 3f39702..1d49ca6 100644 --- a/server/src/main/resources/ehcache.xml +++ b/server/src/main/resources/ehcache.xml @@ -1,3 +1,17 @@ +<!-- + Licensed 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. See accompanying LICENSE file. +--> + <ehcache maxBytesLocalHeap="2048M"> <cache name="StorageCache" eternal="false" http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/server/src/main/resources/kylinSecurity.xml ---------------------------------------------------------------------- diff --git a/server/src/main/resources/kylinSecurity.xml b/server/src/main/resources/kylinSecurity.xml index f8803f6..4683e66 100644 --- a/server/src/main/resources/kylinSecurity.xml +++ b/server/src/main/resources/kylinSecurity.xml @@ -1,3 +1,17 @@ +<!-- + Licensed 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. See accompanying LICENSE file. +--> + <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:tx="http://www.springframework.org/schema/tx"; xmlns:scr="http://www.springframework.org/schema/security"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:context="http://www.springframework.org/schema/context"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/server/src/main/webapp/WEB-INF/kylin-servlet.xml ---------------------------------------------------------------------- diff --git a/server/src/main/webapp/WEB-INF/kylin-servlet.xml b/server/src/main/webapp/WEB-INF/kylin-servlet.xml index 17755cd..c351c6b 100644 --- a/server/src/main/webapp/WEB-INF/kylin-servlet.xml +++ b/server/src/main/webapp/WEB-INF/kylin-servlet.xml @@ -1,3 +1,17 @@ +<!-- + Licensed 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. See accompanying LICENSE file. +--> + <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:context="http://www.springframework.org/schema/context"; http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/server/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/server/src/main/webapp/WEB-INF/web.xml b/server/src/main/webapp/WEB-INF/web.xml index fbbb1cd..abff7dd 100644 --- a/server/src/main/webapp/WEB-INF/web.xml +++ b/server/src/main/webapp/WEB-INF/web.xml @@ -1,4 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed 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. See accompanying LICENSE file. +--> + <web-app xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/server/src/main/webapp/index.html ---------------------------------------------------------------------- diff --git a/server/src/main/webapp/index.html b/server/src/main/webapp/index.html index 94e0828..81fc4c8 100644 --- a/server/src/main/webapp/index.html +++ b/server/src/main/webapp/index.html @@ -1,3 +1,17 @@ +<!-- + Licensed 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. See accompanying LICENSE file. +--> + <html> <head> <title>Welcome to Kylin</title> http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/source-kafka/pom.xml ---------------------------------------------------------------------- diff --git a/source-kafka/pom.xml b/source-kafka/pom.xml index bbfdc05..25d70ea 100644 --- a/source-kafka/pom.xml +++ b/source-kafka/pom.xml @@ -1,4 +1,22 @@ <?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";> http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/storage-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/storage-hbase/pom.xml b/storage-hbase/pom.xml index 1dd133a..70fa3f0 100644 --- a/storage-hbase/pom.xml +++ b/storage-hbase/pom.xml @@ -176,14 +176,17 @@ <configuration> <numUnapprovedLicenses>0</numUnapprovedLicenses> <excludes> - <!-- protobuf --> + <!-- protobuf generated --> <exclude> src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/generated/IIProtos.java </exclude> <exclude> + src/main/java/org/apache/kylin/storage/hbase/cube/v1/filter/generated/FilterProtosExt.java + </exclude> + <exclude> src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/generated/CubeVisitProtos.java </exclude> - <exclude>**/*.proto</exclude> + <exclude>**/src/test/resources/**</exclude> </excludes> </configuration> <executions> http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/filter/protobuf/FilterExt.proto ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/filter/protobuf/FilterExt.proto b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/filter/protobuf/FilterExt.proto index 5783a49..29b0069 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/filter/protobuf/FilterExt.proto +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/filter/protobuf/FilterExt.proto @@ -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. +// + // usage: // protoc --java_out=./storage-hbase/src/main/java ./storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/filter/protobuf/FilterExt.proto http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/protobuf/CubeVisit.proto ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/protobuf/CubeVisit.proto b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/protobuf/CubeVisit.proto index d60d406..5b66a56 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/protobuf/CubeVisit.proto +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/protobuf/CubeVisit.proto @@ -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. +// + // usage: // protoc --java_out=./storage-hbase/src/main/java ./storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/protobuf/CubeVisit.proto http://git-wip-us.apache.org/repos/asf/kylin/blob/fbed0543/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/protobuf/II.proto ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/protobuf/II.proto b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/protobuf/II.proto index 457b7e5..d2c34d4 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/protobuf/II.proto +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/protobuf/II.proto @@ -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. +// + // usage: // protoc --java_out=./storage-hbase/src/main/java ./storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/protobuf/II.proto
