Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
f9ffdf1
format AST classes
liuruiyiyang Jan 14, 2019
1f976cf
format AuthUtils.java and so on
liuruiyiyang Jan 14, 2019
9f7f539
format BasicFunctionOperator.java, etc.
liuruiyiyang Jan 14, 2019
2345481
format BooleanStatistics.java, etc.
liuruiyiyang Jan 14, 2019
89857dd
format ColumnSchema.java, etc.
liuruiyiyang Jan 14, 2019
22cfbf8
format CsvTestDataGen.java, etc.
liuruiyiyang Jan 14, 2019
a0bd4eb
format DoublePrecisionDecoder.java, etc.
liuruiyiyang Jan 15, 2019
15188a5
format ExpressionType.java, etc.
liuruiyiyang Jan 15, 2019
c6912bf
ayz: check style of files that easy to be modified
SolomonAnn Jan 15, 2019
2591d97
Merge branch 'check-style-javadoc' of github.com:thulab/iotdb into ch…
SolomonAnn Jan 15, 2019
2743b53
test jenkins
liuruiyiyang Jan 15, 2019
53a95ee
format Field.java
liuruiyiyang Jan 15, 2019
39b05ec
format FileManager.java
liuruiyiyang Jan 15, 2019
6131307
format
liuruiyiyang Jan 15, 2019
7c73e80
format FileNodeManager.java
liuruiyiyang Jan 15, 2019
0260e3c
format FileNodeManager.java
liuruiyiyang Jan 15, 2019
e8c2e0b
format FileNodeProcessor.java
liuruiyiyang Jan 15, 2019
140d8a5
format FileNodeProcessorStatus.java
liuruiyiyang Jan 15, 2019
fca3b75
test change file name TsFileRuntimeException.java
liuruiyiyang Jan 16, 2019
f84bad0
format
little-emotion Jan 16, 2019
eeb506b
test jenkins for modified class
EJTTianYu Jan 16, 2019
ddfbf1a
modify 10 classes for google style
EJTTianYu Jan 16, 2019
a071885
modify 10 other class for style check
EJTTianYu Jan 16, 2019
fa80d0d
add 10 other classes for style check
EJTTianYu Jan 16, 2019
9b4ee63
modify 10 other classes for style check
EJTTianYu Jan 16, 2019
0196098
modify 10 other classes for style check
EJTTianYu Jan 16, 2019
5aa0f75
test jenkins
EJTTianYu Jan 16, 2019
73f5988
modify 10 other classes for style check
EJTTianYu Jan 16, 2019
6f085c9
check style complete by tianyu modified 70 classes
EJTTianYu Jan 16, 2019
34520c2
Merge pull request #586 from thulab/check-style-tianyu
liuruiyiyang Jan 16, 2019
9eea64d
rename
little-emotion Jan 16, 2019
35254f1
format merge
little-emotion Jan 16, 2019
94082f1
Merge pull request #585 from thulab/check-style-javadoc-suyue
liuruiyiyang Jan 16, 2019
eb92674
format TsFileMetaData.java
liuruiyiyang Jan 16, 2019
e155fe6
fixed check-style problems
jt2594838 Jan 17, 2019
3d77a47
Merge branch 'check-style-javadoc' into check-style-jt
jt2594838 Jan 17, 2019
d923bcb
fix some renaming conflicts
jt2594838 Jan 17, 2019
4a4aabb
revert all VariableDeclarationUsageDistanceCheck modifications in the…
liuruiyiyang Jan 17, 2019
432e522
fix a typo in test
jt2594838 Jan 17, 2019
bce5bff
Merge pull request #587 from thulab/check-style-jt
liuruiyiyang Jan 17, 2019
207934b
trigger test
liuruiyiyang Jan 17, 2019
1d1fad1
test jenkins
liuruiyiyang Jan 17, 2019
30c21d2
modify
liuruiyiyang Jan 17, 2019
a68f46e
code format
LeiRui Jan 17, 2019
d64b1a8
code format
LeiRui Jan 17, 2019
7a01ec8
trigger test
liuruiyiyang Jan 17, 2019
588c4e5
modify old tsfile names
liuruiyiyang Jan 17, 2019
be43444
format code
LeiRui Jan 17, 2019
0f8e767
code format
LeiRui Jan 17, 2019
cf30081
revoke
LeiRui Jan 17, 2019
f3161a8
add javadoc in FileSeriesReader
liuruiyiyang Jan 17, 2019
6c666a7
modify avoid break;
LeiRui Jan 17, 2019
8fc9a24
Merge pull request #589 from thulab/check-style-javadoc-rl
liuruiyiyang Jan 17, 2019
e260a7c
whole project format
liuruiyiyang Jan 17, 2019
58a85a2
revert DatetimeUtils
liuruiyiyang Jan 17, 2019
0907ec1
revert AuthUtils
liuruiyiyang Jan 17, 2019
5edb541
change header
liuruiyiyang Jan 17, 2019
19fdb0c
fix the problem of checkstyle
Jan 17, 2019
f9419d2
Merge branch 'check-style-javadoc' of github.com:thulab/iotdb into ch…
Jan 17, 2019
95855a4
format xml files
Jan 17, 2019
ab4ff22
Revert "format xml files"
Jan 17, 2019
729f5dc
fix license-format template file location
Jan 17, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
158 changes: 80 additions & 78 deletions .mvn/wrapper/MavenWrapperDownloader.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
/**
* Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
*
* 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
* 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
*
Expand All @@ -13,94 +17,92 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import java.net.*;
import java.io.*;
import java.nio.channels.*;
import java.util.Properties;

public class MavenWrapperDownloader {

/**
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
*/
private static final String DEFAULT_DOWNLOAD_URL =
"https://repo1.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar";
/**
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
*/
private static final String DEFAULT_DOWNLOAD_URL =
"https://repo1.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar";

/**
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
* use instead of the default one.
*/
private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
".mvn/wrapper/maven-wrapper.properties";
/**
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
* use instead of the default one.
*/
private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
".mvn/wrapper/maven-wrapper.properties";

/**
* Path where the maven-wrapper.jar will be saved to.
*/
private static final String MAVEN_WRAPPER_JAR_PATH =
".mvn/wrapper/maven-wrapper.jar";
/**
* Path where the maven-wrapper.jar will be saved to.
*/
private static final String MAVEN_WRAPPER_JAR_PATH =
".mvn/wrapper/maven-wrapper.jar";

/**
* Name of the property which should be used to override the default download url for the wrapper.
*/
private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
/**
* Name of the property which should be used to override the default download url for the wrapper.
*/
private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";

public static void main(String args[]) {
System.out.println("- Downloader started");
File baseDirectory = new File(args[0]);
System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
public static void main(String args[]) {
System.out.println("- Downloader started");
File baseDirectory = new File(args[0]);
System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());

// If the maven-wrapper.properties exists, read it and check if it contains a custom
// wrapperUrl parameter.
File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
String url = DEFAULT_DOWNLOAD_URL;
if(mavenWrapperPropertyFile.exists()) {
FileInputStream mavenWrapperPropertyFileInputStream = null;
try {
mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
Properties mavenWrapperProperties = new Properties();
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
} catch (IOException e) {
System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
} finally {
try {
if(mavenWrapperPropertyFileInputStream != null) {
mavenWrapperPropertyFileInputStream.close();
}
} catch (IOException e) {
// Ignore ...
}
}
}
System.out.println("- Downloading from: : " + url);

File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
if(!outputFile.getParentFile().exists()) {
if(!outputFile.getParentFile().mkdirs()) {
System.out.println(
"- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
}
}
System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
// If the maven-wrapper.properties exists, read it and check if it contains a custom
// wrapperUrl parameter.
File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
String url = DEFAULT_DOWNLOAD_URL;
if (mavenWrapperPropertyFile.exists()) {
FileInputStream mavenWrapperPropertyFileInputStream = null;
try {
mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
Properties mavenWrapperProperties = new Properties();
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
} catch (IOException e) {
System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
} finally {
try {
downloadFileFromURL(url, outputFile);
System.out.println("Done");
System.exit(0);
} catch (Throwable e) {
System.out.println("- Error downloading");
e.printStackTrace();
System.exit(1);
if (mavenWrapperPropertyFileInputStream != null) {
mavenWrapperPropertyFileInputStream.close();
}
} catch (IOException e) {
// Ignore ...
}
}
}
System.out.println("- Downloading from: : " + url);

private static void downloadFileFromURL(String urlString, File destination) throws Exception {
URL website = new URL(urlString);
ReadableByteChannel rbc;
rbc = Channels.newChannel(website.openStream());
FileOutputStream fos = new FileOutputStream(destination);
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
fos.close();
rbc.close();
File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
if (!outputFile.getParentFile().exists()) {
if (!outputFile.getParentFile().mkdirs()) {
System.out.println(
"- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath()
+ "'");
}
}
System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
try {
downloadFileFromURL(url, outputFile);
System.out.println("Done");
System.exit(0);
} catch (Throwable e) {
System.out.println("- Error downloading");
e.printStackTrace();
System.exit(1);
}
}

private static void downloadFileFromURL(String urlString, File destination) throws Exception {
URL website = new URL(urlString);
ReadableByteChannel rbc;
rbc = Channels.newChannel(website.openStream());
FileOutputStream fos = new FileOutputStream(destination);
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
fos.close();
rbc.close();
}

}
11 changes: 7 additions & 4 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
#
# Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
#
# 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
# 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
#
Expand All @@ -15,5 +19,4 @@
#

distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip

#wrapperUrl=https://repo1.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ before_install: true
# skip `install` stage
install: true

script:
script:
- mvn clean package -Dmaven.test.skip=true
# For each test, travis-ci limits its output log. So we cannot test some sub-modules like tsfile, iotdb.
# We only test jdbc to ensure maven commands work correctly on travis-ci.
Expand Down
17 changes: 17 additions & 0 deletions asf.header
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)

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.
Loading