jixuan1989
/
IoTDB
mirror of https://github.com/apache/iotdb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,104 Commits 249 Branches 45 Tags 562 MiB
Commit Graph

1104 Commits

Author SHA1 Message Date
CGF 329c7be01e fix spelling error, wirte to write 2017-10-11 10:34:54 +08:00
softpoeter b27ef022ca Merge branch 'fix_issue_94' of https://github.com/thulab/iotdb into fix_issue_94 2017-10-11 10:18:29 +08:00
softpoeter a1e51a7751 fix bug 2017-10-11 10:17:57 +08:00
Dark Templar b9d3ff2e93 update it code 2017-10-10 22:21:21 +08:00
Dark Templar 4908d2197a Merge remote-tracking branch 'origin/master' into fix_issue_94 2017-10-10 22:05:33 +08:00
aoei.me 5f37b7f839 Merge pull request #114 from thulab/fix_issue113_wal_null 
Fix a bug in system.log, logNodeMaps is not init when enableWAL is set to false
 2017-10-10 21:49:58 +08:00
CGF 41864b4c75 Merge branch 'master' into fix_issue113_wal_null 2017-10-10 21:43:20 +08:00
liukun06 23afd1481c support delete timeseries and add diff type timeseries with same name 2017-10-10 21:43:03 +08:00
CGF 30e33b104c modify one line to make jenkins run 2017-10-10 21:38:53 +08:00
softpoeter 4dacae6bde Merge branches 'fix_issue_94' and 'fix_issue_94' of https://github.com/thulab/iotdb into fix_issue_94 2017-10-10 19:15:30 +08:00
softpoeter 6de11422f6 解决update的路径拼接问题，并在多于一个路径时抛出异常。暂时的解决方案，因为要和带value filter的总和设计 2017-10-10 19:13:25 +08:00
Dark Templar ce22f0cc95 Merge branch 'master' into fix_issue_94 2017-10-10 17:57:56 +08:00
Dark Templar 11b1608289 Merge branch 'master' into fix_tsfile_issue_71 2017-10-10 17:30:57 +08:00
Dark Templar 7cb8f8555c recommit for pipline 2017-10-10 16:10:39 +08:00
liukun06 6b2bd78508 remove the unused exception 2017-10-10 15:34:49 +08:00
Dark Templar 0f2b784342 recommit for pipline 2017-10-10 14:58:34 +08:00
liukun e0f5edac99 issue_#54: the sensors which have the same name can't be set diff datatype or encoding in the same storage group (#110) 
* should set storage group first and add timeseries

* add test for metadata

* the same name of last node in diff timeseries can't be set diff datatype or encoding in the same storage group

* storage group will not be deleted now

* modify the test

* support add timeseries when inserting data

* add test for pr

* add exception for bufferwrite processor

* add finally for unlock the filenode processor

* Update MGraph.java

* update MManager.java and BufferWriteProcessor.java
 2017-10-10 14:48:59 +08:00
CGF 36cd13bf78 fix a wal bug, logNodeMaps not init 2017-10-09 23:55:51 +08:00
Dark Templar 38983d244d remove useless config file 2017-10-09 23:47:44 +08:00
Dark Templar 2351f2ae94 remove config ut 2017-10-09 23:10:21 +08:00
Dark Templar 85886d2823 Merge remote-tracking branch 'origin/master' into fix_tsfile_issue_71 2017-10-09 23:09:48 +08:00
Dark Templar 3283d414c9 update config loader 2017-10-09 23:06:42 +08:00
Dark Templar b8d9f3eb15 change delete path for prefix 2017-10-09 12:09:29 +08:00
CGF b63d9b38eb extract code in aggregation package as a common method 2017-10-01 10:45:51 +08:00
CGF 23d6f10431 remove comment 2017-09-30 23:58:26 +08:00
qiaojialingithub 512b31d82c remove some comment 2017-09-27 13:40:59 +08:00
Dark Templar 72c6ae760b remove useless codes 2017-09-25 14:03:06 +08:00
Dark Templar 3dcd2e4193 change name to set storage group in sql name 2017-09-25 13:56:36 +08:00
Dark Templar cda0c1b97e add timeseries path 2017-09-22 20:15:30 +08:00
XuYi 6172d86c39 add |,||,&,&& for or/and in sql (#105) 2017-09-22 19:36:31 +08:00
softpoeter 33e1cbeeae Merge branch 'fix_issue_94' of https://github.com/thulab/iotdb into fix_issue_94 2017-09-22 11:37:28 +08:00
softpoeter 11a9147462 Fix junit case 2017-09-22 11:37:17 +08:00
Dark Templar f281447680 select clause require from clause 2017-09-22 11:36:04 +08:00
softpoeter 0a1a75830f Merge branch 'fix_issue_94' of https://github.com/thulab/iotdb into fix_issue_94 2017-09-22 11:05:21 +08:00
softpoeter 5e22ef822e root path 2017-09-22 11:05:09 +08:00
Dark Templar 13a4c3b8e8 add TOK_PATH for timeseries in sql parse 2017-09-21 10:17:58 +08:00
liukun 922b00b9ba fix delete timesereis which does exist (#108) 
* fix delete timesereis which does exist

* rebuild

* delete test

* add test

* delete test file
 2017-09-21 10:08:57 +08:00
Dark Templar dcc71a5203 change name 2017-09-19 12:12:06 +08:00
CGF 13f0f43aea add multi aggregation with multi filer test 2017-09-19 10:31:34 +08:00
CGF 0602da6a07 complete multi-aggregation with filter in OverflowValueReader,RowGroupReader level 2017-09-18 22:51:46 +08:00
aoei.me 84490c2e24 修复写前日志存在的bug (#99) 
* change system WAL recovery position

* modify jdbc in service test

* move update WAL log in TSServiceImpl.java

* remove the conflicts

* add waiting for merge in the test

* add filenode name param in the funtions of WAL

* add comment, modify prefix
 2017-09-18 17:18:13 +08:00
CGF 43edc943d8 now the five aggregation is right in Memory data, i.e. InserDynamicData 2017-09-17 22:39:58 +08:00
CGF e1de6e0f3b add AggrFunc calcAggregationUsingTimestamps method implementation 2017-09-16 18:07:25 +08:00
CGF b4d07014fc add a test: multi aggregation with single filter 2017-09-16 16:03:46 +08:00
CGF 62c4a893a8 add AggregateFunction calcAggregationUsingTimestamps() method, add MultiAggreWithFilterTest 2017-09-16 11:54:55 +08:00
Dark Templar 47249181dc reforamt codes 2017-09-16 00:09:45 +08:00
Dark Templar a1b32d57b1 remove repeated codes 2017-09-16 00:08:01 +08:00
CGF 37bab9c2af write the aggregation code in OverflowValueReader.readOnePage() method 2017-09-15 22:08:11 +08:00
CGF 03173b7cf1 make service test easy to use, add testFlag 2017-09-15 16:16:23 +08:00
CGF 4229a0c21a move OverflowValueReader method short, make AggregationFactory method abstract 2017-09-15 16:15:36 +08:00