Skip to content

Commit 3824f30

Browse files
committed
Merge branch 'master' of github.com:apache/iotdb into object_delet
2 parents b5a5549 + 7722963 commit 3824f30

File tree

48 files changed

+4557
-127
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+4557
-127
lines changed

LICENSE

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,4 +339,14 @@ LMax Disruptor is open source software licensed under the Apache License 2.0 and
339339
Project page: https://github.com/LMAX-Exchange/disruptor
340340
License: https://github.com/LMAX-Exchange/disruptor/blob/master/LICENCE.txt
341341

342+
--------------------------------------------------------------------------------
343+
344+
The following files include code modified from chronos-forecasting project.
345+
346+
./iotdb-core/ainode/iotdb/ainode/core/model/chronos2/*
347+
348+
The chronos-forecasting is open source software licensed under the Apache License 2.0
349+
Project page: https://github.com/amazon-science/chronos-forecasting
350+
License: https://github.com/amazon-science/chronos-forecasting/blob/main/LICENSE
351+
342352
--------------------------------------------------------------------------------

integration-test/src/test/java/org/apache/iotdb/ainode/utils/AINodeTestUtils.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ public class AINodeTestUtils {
4949
new AbstractMap.SimpleEntry<>(
5050
"sundial", new FakeModelInfo("sundial", "sundial", "builtin", "active")),
5151
new AbstractMap.SimpleEntry<>(
52-
"timer_xl", new FakeModelInfo("timer_xl", "timer", "builtin", "active")))
52+
"timer_xl", new FakeModelInfo("timer_xl", "timer", "builtin", "active")),
53+
new AbstractMap.SimpleEntry<>(
54+
"chronos2", new FakeModelInfo("chronos2", "t5", "builtin", "active")))
5355
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
5456

5557
public static final Map<String, FakeModelInfo> BUILTIN_MODEL_MAP;

integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ public class IoTDBTableIT {
7373
@BeforeClass
7474
public static void setUp() throws Exception {
7575
EnvFactory.getEnv().getConfig().getCommonConfig().setEnforceStrongPassword(false);
76+
EnvFactory.getEnv().getConfig().getCommonConfig().setRestrictObjectLimit(true);
7677
EnvFactory.getEnv().initClusterEnvironment();
7778
}
7879

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
package org.apache.iotdb.pipe.api.collector;
21+
22+
import org.apache.iotdb.pipe.api.access.Row;
23+
import org.apache.iotdb.pipe.api.event.dml.insertion.TabletInsertionEvent;
24+
25+
import java.util.List;
26+
27+
/** Transform data to {@link TabletInsertionEvent}. */
28+
public interface DataCollector {
29+
30+
/**
31+
* Transform data to {@link TabletInsertionEvent}.
32+
*
33+
* @param shouldReport Whether to report progress for generated events
34+
* @see Row
35+
*/
36+
List<TabletInsertionEvent> convertToTabletInsertionEvents(final boolean shouldReport);
37+
}
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
package org.apache.iotdb.pipe.api.collector;
21+
22+
import org.apache.iotdb.pipe.api.access.Row;
23+
import org.apache.iotdb.pipe.api.event.dml.insertion.TabletInsertionEvent;
24+
25+
import org.apache.tsfile.write.record.Tablet;
26+
27+
import java.io.IOException;
28+
import java.util.function.BiConsumer;
29+
30+
/**
31+
* Used to collect rows generated by {@link
32+
* TabletInsertionEvent#processTabletWithCollect(BiConsumer)}.
33+
*/
34+
public interface TabletCollector {
35+
36+
/**
37+
* Collects a tablet.
38+
*
39+
* @param tablet Tablet to be collected
40+
* @throws IOException if any I/O errors occur
41+
* @see Row
42+
*/
43+
void collectTablet(Tablet tablet) throws IOException;
44+
}

iotdb-api/pipe-api/src/main/java/org/apache/iotdb/pipe/api/event/dml/insertion/TabletInsertionEvent.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import org.apache.iotdb.pipe.api.access.Row;
2323
import org.apache.iotdb.pipe.api.collector.RowCollector;
24+
import org.apache.iotdb.pipe.api.collector.TabletCollector;
2425
import org.apache.iotdb.pipe.api.event.Event;
2526

2627
import org.apache.tsfile.write.record.Tablet;
@@ -45,4 +46,14 @@ public interface TabletInsertionEvent extends Event {
4546
* contains the results collected by the {@link RowCollector}
4647
*/
4748
Iterable<TabletInsertionEvent> processTablet(BiConsumer<Tablet, RowCollector> consumer);
49+
50+
/**
51+
* The consumer processes the Tablet directly and collects the results by {@link
52+
* org.apache.iotdb.pipe.api.collector.TabletCollector}.
53+
*
54+
* @return {@code Iterable<TabletInsertionEvent>} a list of new {@link TabletInsertionEvent}
55+
* contains the results collected by the {@link TabletCollector}
56+
*/
57+
Iterable<TabletInsertionEvent> processTabletWithCollect(
58+
BiConsumer<Tablet, TabletCollector> consumer);
4859
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
#

0 commit comments

Comments
 (0)