You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2021/03/12 08:14:22 UTC
[iotdb] 01/01: fix conflicts
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch TYQuery
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ef1ea0157d5483020050e810ac268ee8efba37bd
Merge: c281a85 20ecbc7
Author: JackieTien97 <Ja...@foxmail.com>
AuthorDate: Fri Mar 12 16:14:02 2021 +0800
fix conflicts
.github/workflows/greetings.yml | 13 ++
.../java/org/apache/iotdb/cluster/ClientMain.java | 5 +-
.../java/org/apache/iotdb/cluster/ClusterMain.java | 4 +-
.../iotdb/cluster/client/DataClientProvider.java | 4 +-
.../cluster/client/async/AsyncClientPool.java | 34 ++++--
.../cluster/client/sync/SyncClientAdaptor.java | 6 +-
.../iotdb/cluster/client/sync/SyncClientPool.java | 59 +++++----
.../iotdb/cluster/client/sync/SyncDataClient.java | 9 +-
.../iotdb/cluster/client/sync/SyncMetaClient.java | 10 +-
.../exception/BadSeedUrlFormatException.java | 3 +-
.../apache/iotdb/cluster/metadata/CMManager.java | 92 ++++++--------
.../apache/iotdb/cluster/metadata/MetaPuller.java | 29 ++---
.../cluster/query/ClusterDataQueryExecutor.java | 8 ++
.../iotdb/cluster/query/ClusterPlanExecutor.java | 37 ++----
.../iotdb/cluster/query/LocalQueryExecutor.java | 6 +-
.../cluster/query/aggregate/ClusterAggregator.java | 14 +--
.../cluster/query/fill/ClusterPreviousFill.java | 14 +--
.../query/groupby/RemoteGroupByExecutor.java | 27 ++--
.../query/last/ClusterLastQueryExecutor.java | 14 +--
.../cluster/query/reader/ClusterReaderFactory.java | 24 ++--
.../cluster/query/reader/ClusterTimeGenerator.java | 4 +-
.../iotdb/cluster/query/reader/DataSourceInfo.java | 12 +-
.../apache/iotdb/cluster/server/ClientServer.java | 11 +-
.../cluster/server/PullSnapshotHintService.java | 9 +-
.../caller/PullMeasurementSchemaHandler.java | 7 +-
.../cluster/server/service/BaseSyncService.java | 15 +--
.../cluster/server/service/DataSyncService.java | 7 +-
.../cluster/server/service/MetaSyncService.java | 5 +-
.../cluster/client/DataClientProviderTest.java | 136 +++++++++++++++++++++
.../cluster/client/sync/SyncClientAdaptorTest.java | 5 +-
.../cluster/client/sync/SyncClientPoolTest.java | 17 ++-
.../cluster/client/sync/SyncDataClientTest.java | 51 ++++++++
.../cluster/client/sync/SyncMetaClientTest.java | 47 +++++++
.../org/apache/iotdb/cluster/common/IoTDBTest.java | 4 +-
.../org/apache/iotdb/cluster/common/TestUtils.java | 9 +-
.../caller/PullMeasurementSchemaHandlerTest.java | 10 +-
.../cluster/server/member/DataGroupMemberTest.java | 3 +-
.../cluster/server/member/MetaGroupMemberTest.java | 10 +-
pom.xml | 2 +-
server/src/assembly/resources/conf/iotdb-env.bat | 5 +
server/src/assembly/resources/conf/iotdb-env.sh | 3 +
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 1 -
.../iotdb/db/engine/flush/MemTableFlushTask.java | 8 +-
.../iotdb/db/engine/flush/NotifyFlushMemTable.java | 4 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 8 +-
.../apache/iotdb/db/engine/memtable/IMemTable.java | 4 +-
.../db/engine/memtable/IWritableMemChunk.java | 4 +-
.../db/engine/memtable/PrimitiveMemTable.java | 4 +-
.../iotdb/db/engine/memtable/WritableMemChunk.java | 8 +-
.../db/engine/merge/manage/MergeResource.java | 12 +-
.../db/engine/merge/task/MergeMultiChunkTask.java | 6 +-
.../iotdb/db/engine/merge/task/MergeTask.java | 4 +-
.../engine/storagegroup/StorageGroupProcessor.java | 4 +-
.../apache/iotdb/db/metadata/MLogTxtWriter.java | 4 +-
.../org/apache/iotdb/db/metadata/MManager.java | 13 +-
.../java/org/apache/iotdb/db/metadata/MTree.java | 8 +-
.../apache/iotdb/db/metadata/MeasurementMeta.java | 14 +--
.../iotdb/db/metadata/mnode/MeasurementMNode.java | 11 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 8 +-
.../db/qp/physical/sys/MeasurementMNodePlan.java | 9 +-
.../db/tools/upgrade/TsFileOnlineUpgradeTool.java | 29 ++---
.../org/apache/iotdb/db/utils/SchemaUtils.java | 3 +-
.../query/reader/series/SeriesReaderTestUtil.java | 3 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 3 +-
.../java/org/apache/iotdb/session/Session.java | 6 +-
.../iotdb/spark/tsfile/NarrowConverter.scala | 4 +-
.../apache/iotdb/spark/tsfile/WideConverter.scala | 5 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 13 +-
.../apache/iotdb/tsfile/write/TsFileWriter.java | 13 +-
.../tsfile/write/chunk/ChunkGroupWriterImpl.java | 3 +-
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 8 +-
.../tsfile/write/chunk/IChunkGroupWriter.java | 4 +-
.../apache/iotdb/tsfile/write/page/PageWriter.java | 7 +-
.../tsfile/write/schema/IMeasurementSchema.java | 15 +++
.../tsfile/write/schema/MeasurementSchema.java | 38 +++++-
.../apache/iotdb/tsfile/write/schema/Schema.java | 25 ++--
.../write/writer/RestorableTsFileIOWriter.java | 8 +-
.../org/apache/iotdb/tsfile/utils/RecordUtils.java | 4 +-
.../tsfile/write/DefaultDeviceTemplateTest.java | 3 +-
.../write/schema/converter/SchemaBuilderTest.java | 17 +--
.../write/writer/VectorChunkWriterImplTest.java | 8 ++
.../write/writer/VectorMeasurementSchemaStub.java | 29 +++++
82 files changed, 749 insertions(+), 417 deletions(-)
diff --cc tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/IMeasurementSchema.java
index 855e5fc,e0c3dd7..ee23bef
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/IMeasurementSchema.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/IMeasurementSchema.java
@@@ -23,7 -24,11 +23,12 @@@ import org.apache.iotdb.tsfile.file.met
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
++
+ import java.io.IOException;
+ import java.io.OutputStream;
+ import java.nio.ByteBuffer;
import java.util.List;
+ import java.util.Map;
public interface IMeasurementSchema {
diff --cc tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/VectorChunkWriterImplTest.java
index 3ca81b1,93e18bb..7866f48
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/VectorChunkWriterImplTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/VectorChunkWriterImplTest.java
@@@ -65,7 -65,7 +65,11 @@@ public class VectorChunkWriterImplTest
(byte) (0x80 | MetaMarker.ONLY_ONE_PAGE_CHUNK_HEADER), ReadWriteIOUtils.readByte(buffer));
assertEquals("s1.time", ReadWriteIOUtils.readVarIntString(buffer));
assertEquals(164, ReadWriteForEncodingUtils.readUnsignedVarInt(buffer));
++<<<<<<< HEAD
+ assertEquals(TSDataType.VECTOR.serialize(), ReadWriteIOUtils.readByte(buffer));
++=======
+ assertEquals(TSDataType.Vector.serialize(), ReadWriteIOUtils.readByte(buffer));
++>>>>>>> origin/Vector
assertEquals(CompressionType.UNCOMPRESSED.serialize(), ReadWriteIOUtils.readByte(buffer));
assertEquals(TSEncoding.PLAIN.serialize(), ReadWriteIOUtils.readByte(buffer));
buffer.position(buffer.position() + 164);
@@@ -138,7 -138,7 +142,11 @@@
assertEquals((byte) (0x80 | MetaMarker.CHUNK_HEADER), ReadWriteIOUtils.readByte(buffer));
assertEquals("s1.time", ReadWriteIOUtils.readVarIntString(buffer));
assertEquals(362, ReadWriteForEncodingUtils.readUnsignedVarInt(buffer));
++<<<<<<< HEAD
+ assertEquals(TSDataType.VECTOR.serialize(), ReadWriteIOUtils.readByte(buffer));
++=======
+ assertEquals(TSDataType.Vector.serialize(), ReadWriteIOUtils.readByte(buffer));
++>>>>>>> origin/Vector
assertEquals(CompressionType.UNCOMPRESSED.serialize(), ReadWriteIOUtils.readByte(buffer));
assertEquals(TSEncoding.PLAIN.serialize(), ReadWriteIOUtils.readByte(buffer));
buffer.position(buffer.position() + 362);
diff --cc tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/VectorMeasurementSchemaStub.java
index 40335f5,795a0a6..7216aec
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/VectorMeasurementSchemaStub.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/VectorMeasurementSchemaStub.java
@@@ -18,6 -18,6 +18,10 @@@
*/
package org.apache.iotdb.tsfile.write.writer;
++import java.io.IOException;
++import java.io.OutputStream;
++import java.nio.ByteBuffer;
++import java.util.Map;
import org.apache.iotdb.tsfile.encoding.encoder.Encoder;
import org.apache.iotdb.tsfile.encoding.encoder.PlainEncoder;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
@@@ -41,8 -41,8 +45,13 @@@ public class VectorMeasurementSchemaStu
}
@Override
++ public TSEncoding getEncodingType() {
++ return null;
++ }
++
++ @Override
public TSDataType getType() {
- return TSDataType.Vector;
+ return TSDataType.VECTOR;
}
@Override
@@@ -56,6 -56,6 +65,16 @@@
}
@Override
++ public Encoder getValueEncoder() {
++ return null;
++ }
++
++ @Override
++ public Map<String, String> getProps() {
++ return null;
++ }
++
++ @Override
public List<String> getValueMeasurementIdList() {
return Arrays.asList("s1", "s2", "s3");
}
@@@ -77,4 -77,4 +96,14 @@@
new PlainEncoder(TSDataType.INT32, 0),
new PlainEncoder(TSDataType.DOUBLE, 0));
}
++
++ @Override
++ public int serializeTo(ByteBuffer buffer) {
++ return 0;
++ }
++
++ @Override
++ public int serializeTo(OutputStream outputStream) throws IOException {
++ return 0;
++ }
}