-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
upgrade iotdb to 0.7.0 and spark to 2.1.0
- Loading branch information
1 parent
44ea1f2
commit 3be3914
Showing
14 changed files
with
395 additions
and
419 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
package cn.edu.tsinghua.iotdb; | ||
|
||
/** | ||
* this class contains several constants used in SQL. | ||
* | ||
*/ | ||
public class SQLConstant { | ||
|
||
public static final String NEED_NOT_TO_PRINT_TIMESTAMP = "AGGREGATION"; | ||
public static final String RESERVED_TIME = "time"; | ||
public static final String TIMESTAMP_STR = "Time"; // new added | ||
public static final String NULL_STR = "null"; // new added | ||
|
||
} |
136 changes: 0 additions & 136 deletions
136
src/main/java/cn/edu/tsinghua/tsfile/qp/common/SQLConstant.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...n/edu/tsinghua/tsfile/TSFileOptions.scala → .../cn/edu/tsinghua/iotdb/IoTDBOptions.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.