Skip to content

Commit

Permalink
Fix license issue and unify line break (#16)
Browse files Browse the repository at this point in the history
  • Loading branch information
HTHou authored Aug 28, 2024
1 parent 5211c9c commit cb9d890
Show file tree
Hide file tree
Showing 58 changed files with 3,981 additions and 3,146 deletions.
50 changes: 25 additions & 25 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
**/.classpath
**/.dockerignore
**/.env
**/.git
**/.gitignore
**/.project
**/.settings
**/.toolstarget
**/.vs
**/.vscode
**/*.*proj.user
**/*.dbmdl
**/*.jfm
**/azds.yaml
**/bin
**/charts
**/docker-compose*
**/Dockerfile*
**/node_modules
**/npm-debug.log
**/obj
**/secrets.dev.yaml
**/values.dev.yaml
LICENSE
README.md
**/.classpath
**/.dockerignore
**/.env
**/.git
**/.gitignore
**/.project
**/.settings
**/.toolstarget
**/.vs
**/.vscode
**/*.*proj.user
**/*.dbmdl
**/*.jfm
**/azds.yaml
**/bin
**/charts
**/docker-compose*
**/Dockerfile*
**/node_modules
**/npm-debug.log
**/obj
**/secrets.dev.yaml
**/values.dev.yaml
LICENSE
README.md
18 changes: 18 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +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.

* text=auto eol=lf
4 changes: 4 additions & 0 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ jobs:
dotnet-version: '6.0.x'
- name: Restore dependencies
run: dotnet restore "src/Apache.IoTDB/Apache.IoTDB.csproj"
- name: Check License Header
# skywalking-eyes doesn't support windows
if: runner.os == 'Linux'
uses: apache/[email protected]
- name: Build
run: dotnet build --no-restore "src/Apache.IoTDB/Apache.IoTDB.csproj"
- name: Test
Expand Down
36 changes: 36 additions & 0 deletions .licenserc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# 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.

header:
license:
spdx-id: Apache-2.0
copyright-owner: Apache Software Foundation

paths-ignore:
- 'docs'
- 'src/Apache.IoTDB/Rpc/Generated'
- '**/*.md'
- '**/*.yml'
- '**/*.json'
- '**/*.csproj'
- '**/*.dcproj'
- 'LICENSE'
- 'Apache.IoTDB.sln'
- '.gitignore'
- '.dockerignore'

comment: on-failure
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
<PackageReference Include="Apache.IoTDB" Version="1.0.0.3" />
</ItemGroup>

</Project>
</Project>
19 changes: 19 additions & 0 deletions Apache-IoTDB-Client-CSharp-UserCase/Program.cs
Original file line number Diff line number Diff line change
@@ -1,3 +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.
*/

using System;
using System.Collections.Generic;
using System.Threading;
Expand Down
258 changes: 129 additions & 129 deletions Apache.IoTDB.sln

Large diffs are not rendered by default.

35 changes: 0 additions & 35 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -199,38 +199,3 @@ Apache License
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.

--------------------------------------------------------------------------------
APACHE IOTDB SUBCOMPONENTS
--------------------------------------------------------------------------------

The following class is copied from maven-wrapper (https://github.com/takari/maven-wrapper),
which is under Apache License 2.0:

./.mvn/wrapper/MavenWrapperDownloader.java

--------------------------------------------------------------------------------

The following class is modified from Apache commons-collections

./tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Murmur128Hash.java
Relevant pr is: https://github.com/apache/commons-collections/pull/83/

--------------------------------------------------------------------------------

The following files include code modified from Michael Burman's gorilla-tsc project.

./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/GorillaEncoderV2.java
./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntGorillaEncoder.java
./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongGorillaEncoder.java
./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SinglePrecisionEncoderV2.java
./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoublePrecisionEncoderV2.java
./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoderV2.java
./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntGorillaDecoder.java
./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongGorillaDecoder.java
./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/SinglePrecisionDecoderV2.java
./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoublePrecisionDecoderV2.java

Copyright: 2016-2018 Michael Burman and/or other contributors
Project page: https://github.com/burmanm/gorilla-tsc
License: http://www.apache.org/licenses/LICENSE-2.0
28 changes: 14 additions & 14 deletions docker-compose.dcproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" Sdk="Microsoft.Docker.Sdk">
<PropertyGroup Label="Globals">
<ProjectVersion>2.1</ProjectVersion>
<DockerTargetOS>Linux</DockerTargetOS>
<ProjectGuid>4d457769-80cb-401f-9155-c3125c04facd</ProjectGuid>
</PropertyGroup>
<ItemGroup>
<None Include="docker-compose.override.yml">
<DependentUpon>docker-compose.yml</DependentUpon>
</None>
<None Include="docker-compose.yml" />
<None Include=".dockerignore" />
</ItemGroup>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" Sdk="Microsoft.Docker.Sdk">
<PropertyGroup Label="Globals">
<ProjectVersion>2.1</ProjectVersion>
<DockerTargetOS>Linux</DockerTargetOS>
<ProjectGuid>4d457769-80cb-401f-9155-c3125c04facd</ProjectGuid>
</PropertyGroup>
<ItemGroup>
<None Include="docker-compose.override.yml">
<DependentUpon>docker-compose.yml</DependentUpon>
</None>
<None Include="docker-compose.yml" />
<None Include=".dockerignore" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version: '3.4'
version: '3.4'
124 changes: 62 additions & 62 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,62 +1,62 @@
version: '3.4'

services:
apache.iotdb.samples:
image: ${DOCKER_REGISTRY-}apacheiotdbsamples
depends_on:
iotdb:
condition: service_healthy
links:
- iotdb
build:
context: .
dockerfile: samples/Apache.IoTDB.Samples/Dockerfile
networks:
iotdb-network:
ipv4_address: 172.18.0.2

iotdb:
image: apache/iotdb:1.3.2-datanode
restart: always
container_name: iotdb-dn-1
depends_on:
iotdb-confignode-1:
condition: service_healthy
healthcheck:
test: ["CMD", "ls", "/iotdb/data/datanode/system"]
interval: 10s
timeout: 60s
retries: 30
start_period: 30s
ports:
- 6667:6667
networks:
iotdb-network:
ipv4_address: 172.18.0.3
environment:
- dn_rpc_address=iotdb
- dn_internal_address=iotdb
- dn_seed_config_node=iotdb-confignode-1:22277

iotdb-confignode-1:
image: apache/iotdb:1.3.2-confignode
restart: always
container_name: iotdb-cn-1
healthcheck:
test: ["CMD", "ls", "/iotdb/data"]
interval: 3s
timeout: 5s
retries: 30
start_period: 30s
networks:
iotdb-network:
ipv4_address: 172.18.0.4
environment:
- cn_internal_address=iotdb-confignode-1
- cn_internal_port=22277
- cn_seed_config_node=iotdb-confignode-1:22277


networks:
iotdb-network:
external: true
version: '3.4'

services:
apache.iotdb.samples:
image: ${DOCKER_REGISTRY-}apacheiotdbsamples
depends_on:
iotdb:
condition: service_healthy
links:
- iotdb
build:
context: .
dockerfile: samples/Apache.IoTDB.Samples/Dockerfile
networks:
iotdb-network:
ipv4_address: 172.18.0.2

iotdb:
image: apache/iotdb:1.3.2-datanode
restart: always
container_name: iotdb-dn-1
depends_on:
iotdb-confignode-1:
condition: service_healthy
healthcheck:
test: ["CMD", "ls", "/iotdb/data/datanode/system"]
interval: 10s
timeout: 60s
retries: 30
start_period: 30s
ports:
- 6667:6667
networks:
iotdb-network:
ipv4_address: 172.18.0.3
environment:
- dn_rpc_address=iotdb
- dn_internal_address=iotdb
- dn_seed_config_node=iotdb-confignode-1:22277

iotdb-confignode-1:
image: apache/iotdb:1.3.2-confignode
restart: always
container_name: iotdb-cn-1
healthcheck:
test: ["CMD", "ls", "/iotdb/data"]
interval: 3s
timeout: 5s
retries: 30
start_period: 30s
networks:
iotdb-network:
ipv4_address: 172.18.0.4
environment:
- cn_internal_address=iotdb-confignode-1
- cn_internal_port=22277
- cn_seed_config_node=iotdb-confignode-1:22277


networks:
iotdb-network:
external: true
26 changes: 13 additions & 13 deletions launchSettings.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"profiles": {
"Docker Compose": {
"commandName": "DockerCompose",
"commandVersion": "1.0",
"composeLaunchAction": "None",
"composeLaunchServiceName": "apache.iotdb.samples",
"serviceActions": {
"apache.iotdb.samples": "StartDebugging",
"iotdb": "StartWithoutDebugging"
}
}
}
{
"profiles": {
"Docker Compose": {
"commandName": "DockerCompose",
"commandVersion": "1.0",
"composeLaunchAction": "None",
"composeLaunchServiceName": "apache.iotdb.samples",
"serviceActions": {
"apache.iotdb.samples": "StartDebugging",
"iotdb": "StartWithoutDebugging"
}
}
}
}
Loading

0 comments on commit cb9d890

Please sign in to comment.