You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/02/18 06:02:46 UTC
[incubator-iotdb] branch ut_close_socket updated (5cde236 ->
2571fbf)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch ut_close_socket
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 5cde236 print which files are left after cleaning a folder
add c400bf1 [IOTDB-405] cache results in the client and makes the display look nice. (#782)
add f9287cb Fix Query Bug (#788)
add 5b0f7ff remove usused daemon. (#787)
add 3baa733 Add sync design doc (#783)
add ee76d50 Self-serve modification of git topics (#789)
add 81f9928 Revert "Self-serve modification of git topics (#789)" (#791)
add e3f7437 self-serve modification of git topics (#792)
add 1013014 [IOTDB-470]fix IllegalArgumentException when there exists 0 byte TsFile (#784)
add 5c059bf change maven-download-plugin to 1.3.0 (#794)
add 9a4b83c Typos in Fill (#795)
add 6ddb2c3 [IOTDB-471] fix bug (#786)
add f127a26 Revert "[IOTDB-471] fix bug (#786)" (#799)
add a6bd21a Enable auto create schema (#797)
add d079a4d [IOTDB-471] fix and try to locate latestTimeForEachDevice null pointer bug (#800)
add 3d8e036 [IOTDB-486] Correct typo and broken link in `example/ rocketmq/readme.md`
add c1c56ba [IOTDB-485] Fix the broken link for `Client/Shell tools`
add b3ef2e0 [IOTDB-489] Variable url pattern should be defined as a constant
add f63acfb [IOTDB-484] Added maven status badge (#807)
add c72281f [IOTDB-488] Static members shouldn't be accessed through class instances
add 866eb70 [IOTDB-467] The CLI displays query results in a batch manner (#806)
add ee88d73 Add more log of compression ratio (#801)
add 15c5c34 Fix time parititon problem (#816)
add e502f5d [IOTDB-491] Constant name `pool ` should be all uppercase (#813)
new 2a434dd merge with master
new 2571fbf merge with master
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../resources/sbin/stop-server.sh => .asf.yaml | 22 +-
README.md | 1 +
.../org/apache/iotdb/client/AbstractClient.java | 484 +++++++--------------
.../main/java/org/apache/iotdb/client/Client.java | 32 +-
.../java/org/apache/iotdb/client/WinClient.java | 31 +-
.../SystemDesign/6-Tools/1-Sync.md | 279 +++++++++++-
.../2-DML (Data Manipulation Language).md | 6 +-
example/rocketmq/readme.md | 4 +-
.../iotdb/jdbc/IoTDBNonAlignQueryResultSet.java | 8 +-
.../src/main/java/org/apache/iotdb/jdbc/Utils.java | 7 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +-
.../iotdb/db/engine/memtable/WritableMemChunk.java | 15 +
.../engine/storagegroup/StorageGroupProcessor.java | 26 +-
.../db/engine/storagegroup/TsFileProcessor.java | 13 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 2 +-
.../db/query/dataset/DeviceIterateDataSet.java | 15 +-
.../NewEngineDataSetWithoutValueFilter.java | 8 +-
.../SeriesReaderWithoutValueFilter.java | 15 +-
.../iotdb/db/sync/sender/transfer/SyncClient.java | 9 +-
.../org/apache/iotdb/db/utils/UpgradeUtils.java | 6 +-
.../iotdb/db/integration/IoTDBAuthorizationIT.java | 1 +
.../db/integration/IoTDBDeleteStorageGroupIT.java | 33 +-
.../iotdb/db/integration/IoTDBDisableAlignIT.java | 1 -
.../iotdb/db/integration/IoTDBQueryDemoIT.java | 14 +-
.../iotdb/db/integration/IoTDBRecoverIT.java | 16 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 12 +-
26 files changed, 572 insertions(+), 490 deletions(-)
copy server/src/assembly/resources/sbin/stop-server.sh => .asf.yaml (79%)
mode change 100755 => 100644
[incubator-iotdb] 02/02: merge with master
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch ut_close_socket
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 2571fbfa03a97b492b3d852d91938cbb1cd901a2
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Tue Feb 18 14:02:27 2020 +0800
merge with master
---
.../java/org/apache/iotdb/db/utils/EnvironmentUtils.java | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java b/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
index f1f189b..233da32 100644
--- a/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
+++ b/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
@@ -186,20 +186,10 @@ public class EnvironmentUtils {
* disable memory control</br> this function should be called before all code in the setup
*/
public static void envSetUp() throws StartupException {
- envSetUp(daemon);
- }
-
- /**
- * disable memory control</br> this function should be called before all code in the setup
- * <br> the caller should not call daemon.active(). This method will call the active() method.
- */
- public static void envSetUp(IoTDB daemon) throws StartupException {
System.setProperty(IoTDBConstant.REMOTE_JMX_PORT_NAME, "31999");
IoTDBDescriptor.getInstance().getConfig().setThriftServerAwaitTimeForStopService(0);
if (daemon == null) {
- EnvironmentUtils.daemon = new IoTDB();
- } else {
- EnvironmentUtils.daemon = daemon;
+ daemon = new IoTDB();
}
try {
EnvironmentUtils.daemon.active();
[incubator-iotdb] 01/02: merge with master
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch ut_close_socket
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 2a434dd01021f780b3316880770835b4ba030ee0
Merge: 5cde236 e502f5d
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Tue Feb 18 14:02:17 2020 +0800
merge with master
.asf.yaml | 30 ++
README.md | 1 +
.../org/apache/iotdb/client/AbstractClient.java | 484 +++++++--------------
.../main/java/org/apache/iotdb/client/Client.java | 32 +-
.../java/org/apache/iotdb/client/WinClient.java | 31 +-
.../SystemDesign/6-Tools/1-Sync.md | 279 +++++++++++-
.../2-DML (Data Manipulation Language).md | 6 +-
example/rocketmq/readme.md | 4 +-
.../iotdb/jdbc/IoTDBNonAlignQueryResultSet.java | 8 +-
.../src/main/java/org/apache/iotdb/jdbc/Utils.java | 7 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +-
.../iotdb/db/engine/memtable/WritableMemChunk.java | 15 +
.../engine/storagegroup/StorageGroupProcessor.java | 26 +-
.../db/engine/storagegroup/TsFileProcessor.java | 13 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 2 +-
.../db/query/dataset/DeviceIterateDataSet.java | 15 +-
.../NewEngineDataSetWithoutValueFilter.java | 8 +-
.../SeriesReaderWithoutValueFilter.java | 15 +-
.../iotdb/db/sync/sender/transfer/SyncClient.java | 9 +-
.../org/apache/iotdb/db/utils/UpgradeUtils.java | 6 +-
.../iotdb/db/integration/IoTDBAuthorizationIT.java | 1 +
.../db/integration/IoTDBDeleteStorageGroupIT.java | 33 +-
.../iotdb/db/integration/IoTDBDisableAlignIT.java | 1 -
.../iotdb/db/integration/IoTDBQueryDemoIT.java | 14 +-
.../iotdb/db/integration/IoTDBRecoverIT.java | 16 +-
25 files changed, 590 insertions(+), 468 deletions(-)
diff --cc server/src/test/java/org/apache/iotdb/db/integration/IoTDBRecoverIT.java
index a06a0cc,2ec2bdd..4c3a2ec
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBRecoverIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBRecoverIT.java
@@@ -82,8 -81,7 +81,8 @@@ public class IoTDBRecoverIT
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- daemon = IoTDB.getInstance();
- EnvironmentUtils.envSetUp(daemon);
++
+ EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
prepareData();
}
@@@ -216,8 -213,7 +214,8 @@@
} catch (InterruptedException e) {
e.printStackTrace();
}
- daemon.active();
- //EnvironmentUtils.envSetUp();
++
+ EnvironmentUtils.activeDaemon();
// maxminValueTest