Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
* Added accountable function to measurementSchema by @Caideyipi in #509
* Correct the retained size calculation for BinaryColumn and BinaryColumnBuilder by @JackieTien97 in #514
* add switch to disable native lz4 (#480) by @jt2594838 in #515
* Correct the memroy calculation of BinaryColumnBuilder by @JackieTien97 in #530
* Correct the memory calculation of BinaryColumnBuilder by @JackieTien97 in #530
* Fetch max tsblock line number each time from TSFileConfig by @JackieTien97 in #535
* Support set default compression by data type & Bump org.apache.commons:commons-lang3 from 3.15.0 to 3.18.0 by @jt2594838 in #547
* Avoid calculating shallow size of map by @shuwenwei in #566
Expand Down
2 changes: 1 addition & 1 deletion cpp/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ then
cd build/minsizerel
else
echo ""
echo "unknow build type: ${build_type}, valid build types(case intensive): Debug, Release, RelWithDebInfo, MinSizeRel"
echo "unknown build type: ${build_type}, valid build types(case insensitive): Debug, Release, RelWithDebInfo, MinSizeRel"
echo ""
exit 1
fi
Expand Down
2 changes: 1 addition & 1 deletion cpp/examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ under the License.
]]
cmake_minimum_required(VERSION 3.10)
project(examples)
message("Running in exampes directory")
message("Running in examples directory")

if (NOT MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
Expand Down
18 changes: 9 additions & 9 deletions cpp/src/common/allocator/byte_stream.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,21 +55,21 @@ class OptionalAtomic {
}
}

FORCE_INLINE T atomic_faa(const T increament) {
FORCE_INLINE T atomic_faa(const T increment) {
if (UNLIKELY(enable_atomic_)) {
return ATOMIC_FAA(&val_, increament);
return ATOMIC_FAA(&val_, increment);
} else {
T old_val = val_;
val_ = val_ + increament;
val_ = val_ + increment;
return old_val;
}
}

FORCE_INLINE T atomic_aaf(const T increament) {
FORCE_INLINE T atomic_aaf(const T increment) {
if (UNLIKELY(enable_atomic_)) {
return ATOMIC_AAF(&val_, increament);
return ATOMIC_AAF(&val_, increment);
} else {
val_ = val_ + increament;
val_ = val_ + increment;
return val_;
}
}
Expand Down Expand Up @@ -378,7 +378,7 @@ class ByteStream {

// reader @want_len bytes to @buf, @read_len indicates real len we reader.
// if ByteStream do not have so many bytes, it will return E_PARTIAL_READ if
// no other error occure.
// no other error occur.
int read_buf(uint8_t* buf, const uint32_t want_len, uint32_t& read_len) {
int ret = common::E_OK;
bool partial_read = (read_pos_ + want_len > total_size_.load());
Expand Down Expand Up @@ -540,7 +540,7 @@ class ByteStream {
return b;
}
if (UNLIKELY(cur_ == nullptr)) {
// this consumer did not initialiazed.
// this consumer did not initialized.
cur_ = host_.head_.load();
read_offset_within_cur_page_ = 0;
}
Expand Down Expand Up @@ -717,7 +717,7 @@ FORCE_INLINE int copy_bs_to_buf(ByteStream& bs, char* src_buf,

FORCE_INLINE uint32_t get_var_uint_size(
uint32_t
ui32) // return: the length of usigned number after varint encoding.
ui32) // return: the length of unsigned number after varint encoding.
{
uint32_t bytes = 0;
while ((ui32 & 0xFFFFFF80) != 0) {
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/common/cache/lru_cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class Cache {
prune();
}
/**
for backward compatibity. redirects to tryGetCopy()
for backward compatibility. redirects to tryGetCopy()
*/
bool tryGet(const Key& kIn, Value& vOut) { return tryGetCopy(kIn, vOut); }

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/common/global.cc
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ int init_common() {
}

bool is_timestamp_column_name(const char* time_col_name) {
// both "time" and "timestamp" refer to timestmap column.
// both "time" and "timestamp" refer to timestamp column.
int32_t len = strlen(time_col_name);
if (len == 4) {
return strncasecmp(time_col_name, "time", 4) == 0;
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/common/seq_tvlist.inc
Original file line number Diff line number Diff line change
Expand Up @@ -170,5 +170,5 @@ int32_t SeqTVList<Type>::binary_search_upper(int64_t time)
return start;
}

} // namepsace storage
} // namespace storage

2 changes: 1 addition & 1 deletion cpp/src/encoding/int32_sprintz_encoder.h
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ class Int32SprintzEncoder : public SprintzEncoder {
} else if (predict_method_ == "fire") {
pred = fire(value, prev);
} else {
// unsupport
// unsupported
ASSERT(false);
}

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/file/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
]]
message("running in src/file diectory")
message("running in src/file directory")

message("CMAKE_CURRENT_SOURCE_DIR: ${CMAKE_CURRENT_SOURCE_DIR}")
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/file/tsfile_io_writer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -799,7 +799,7 @@ int TsFileIOWriter::generate_root(
if (RET_FAIL(to->push_back(cur_index_node))) {
}
#if DEBUG_SE
std::cout << "genereate root 2, "
std::cout << "generate root 2, "
"alloc_and_init_meta_index_node. cur_index_node="
<< *cur_index_node << std::endl;
#endif
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/parser/PathLexer.g4
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ TIMESTAMP
* 3. Operators
*/

// Operators. Arithmetics
// Operators. Arithmetic

MINUS : '-';
PLUS : '+';
DIV : '/';
MOD : '%';


// Operators. Comparation
// Operators. Comparison

OPERATOR_DEQ : '==';
OPERATOR_SEQ : '=';
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/utils/util_define.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ typedef int mode_t;
#define TSFILE_API
#endif

/* ======== unsued ======== */
/* ======== unused ======== */
#define UNUSED(v) ((void)(v))
#if __cplusplus >= 201703L
#define MAYBE_UNUSED [[maybe_unused]]
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/writer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
]]
message("running in src/write diectory")
message("running in src/write directory")

message("CMAKE_CURRENT_SOURCE_DIR: ${CMAKE_CURRENT_SOURCE_DIR}")
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/writer/page_writer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ int PageData::init(ByteStream& time_bs, ByteStream& value_bs,
} else {
// TODO
// NOTE: different compressor may have different compress API
// Be carefull about the memory.
// Be careful about the memory.
if (RET_FAIL(compressor->reset(true))) {
} else if (RET_FAIL(compressor->compress(
uncompressed_buf_, uncompressed_size_, compressed_buf_,
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/writer/time_page_writer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ int TimePageData::init(ByteStream& time_bs, Compressor* compressor) {
} else {
// TODO
// NOTE: different compressor may have different compress API
// Be carefull about the memory.
// Be careful about the memory.
if (RET_FAIL(compressor->reset(true))) {
} else if (RET_FAIL(compressor->compress(
uncompressed_buf_, uncompressed_size_, compressed_buf_,
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/writer/value_page_writer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ int ValuePageData::init(ByteStream& col_notnull_bitmap_bs, ByteStream& value_bs,
} else {
// TODO
// NOTE: different compressor may have different compress API
// Be carefull about the memory.
// Be careful about the memory.
if (RET_FAIL(compressor->reset(true))) {
} else if (RET_FAIL(compressor->compress(
uncompressed_buf_, uncompressed_size_, compressed_buf_,
Expand Down
2 changes: 1 addition & 1 deletion cpp/test/common/row_record_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ TEST(FieldTest, IsLiteral) {

TEST(FieldTest, SetValue) {
Field field;
common::PageArena pa; // dosen't matter
common::PageArena pa; // doesn't matter
int32_t i32_val = 123;
field.set_value(common::INT32, &i32_val, common::get_len(common::INT32),
pa);
Expand Down
2 changes: 1 addition & 1 deletion cpp/test/writer/tsfile_writer_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ TEST_F(TsFileWriterTest, FlushMultipleDevice) {
break;
}
record = qds->get_row_record();
// if empty chunk is writen, the timestamp should be NULL
// if empty chunk is written, the timestamp should be NULL
if (!record) {
break;
}
Expand Down
2 changes: 1 addition & 1 deletion docs/src/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ highlights:
details: TsFile employs advanced compression techniques to minimize storage requirements, resulting in reduced disk space consumption and improved system efficiency.

- title: Flexible Schema and Metadata Management
details: TsFile allows for directly write data without pre defining the schema, which is flexible for data aquisition.
details: TsFile allows for directly write data without pre defining the schema, which is flexible for data acquisition.

- title: High Query Performance with time range
details: TsFile has indexed devices, sensors and time dimensions to accelerate query performance, enabling fast filtering and retrieval of time series data.
Expand Down
2 changes: 1 addition & 1 deletion docs/src/stage/QuickStart.md
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ The ReadOnlyTsFile class has two `query` method to perform a query.

> **What is Partial Query ?**
>
> In some distributed file systems(e.g. HDFS), a file is split into severval parts which are called "Blocks" and stored in different nodes. Executing a query paralleled in each nodes involved makes better efficiency. Thus Partial Query is needed. Paritial Query only selects the results stored in the part split by ```QueryConstant.PARTITION_START_OFFSET``` and ```QueryConstant.PARTITION_END_OFFSET``` for a TsFile.
> In some distributed file systems(e.g. HDFS), a file is split into several parts which are called "Blocks" and stored in different nodes. Executing a query paralleled in each nodes involved makes better efficiency. Thus Partial Query is needed. Partial Query only selects the results stored in the part split by ```QueryConstant.PARTITION_START_OFFSET``` and ```QueryConstant.PARTITION_END_OFFSET``` for a TsFile.

* QueryDataset Interface

Expand Down
4 changes: 2 additions & 2 deletions docs/src/zh/Development/Community-Project-Committers.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@
我们的社区存在以下四种身份

- PMC
- Committe
- Committer
- Contributor
- User

详细说明:

- 若想了解四种身份的详细内容,请查看[社区组织架构](../Community/About.md)
- 若想成为 PMC ,请查看:[社区评选规章](../Community/About.md#pmc)
- 若想成为 Committe ,请查看:[社区评选规章](../Community/About.md#committe)
- 若想成为 Committer ,请查看:[社区评选规章](../Community/About.md#committer)
- 若想成为 Contributor ,请查看:[社区评选规章](../Community/About.md#contributor)
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,9 @@ default TsPrimitiveType getTsPrimitiveType(int position) {
Column subColumnCopy(int fromIndex);

/**
* Create a new colum from the current colum by keeping the same elements only with respect to
* Create a new column from the current column by keeping the same elements only with respect to
* {@code positions} that starts at {@code offset} and has length of {@code length}. The
* implementation may return a view over the data in this colum or may return a copy, and the
* implementation may return a view over the data in this column or may return a copy, and the
* implementation is allowed to retain the positions array for use in the view.
*/
Column getPositions(int[] positions, int offset, int length);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -722,16 +722,16 @@ error.encoding.ts_encoding_builder_unsupported_type = %1$s doesn't support data
log.encoding.flush_data_failed = flush data to stream failed!

# DoubleSprintzEncoder — encoding error
log.encoding.sprintz_double_encode_error = Error occured when encoding INT32 Type value with with Sprintz
log.encoding.sprintz_double_encode_error = Error occurred when encoding INT32 Type value with Sprintz

# FloatSprintzEncoder — encoding error
log.encoding.sprintz_float_encode_error = Error occured when encoding Float Type value with with Sprintz
log.encoding.sprintz_float_encode_error = Error occurred when encoding Float Type value with Sprintz

# IntSprintzEncoder — encoding error
log.encoding.sprintz_int_encode_error = Error occured when encoding INT32 Type value with with Sprintz
log.encoding.sprintz_int_encode_error = Error occurred when encoding INT32 Type value with Sprintz

# LongSprintzEncoder — encoding error
log.encoding.sprintz_long_encode_error = Error occured when encoding INT64 Type value with with Sprintz
log.encoding.sprintz_long_encode_error = Error occurred when encoding INT64 Type value with Sprintz

# DictionaryEncoder — flush error
log.encoding.dictionary_encoder_flush_error = tsfile-encoding DictionaryEncoder: error occurs when flushing
Expand Down Expand Up @@ -778,7 +778,7 @@ log.encoding.long_rle_decoder_read_error = tsfile-encoding IntRleDecoder: error
log.encoding.dictionary_decoder_error = tsfile-decoding DictionaryDecoder: error occurs when decoding

# FloatSprintzDecoder / IntSprintzDecoder / DoubleSprintzDecoder / LongSprintzDecoder — readInt error (4 sites, 1 key)
log.encoding.sprintz_decoder_read_error = Error occured when readInt with Sprintz Decoder.
log.encoding.sprintz_decoder_read_error = Error occurred when readInt with Sprintz Decoder.

# TSEncodingBuilder — max string length negative value warning
log.encoding.ts_encoding_max_string_length_negative = cannot set max string length to negative value, replaced with default value:{}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

/** This tool is used to read TsFile sequentially, including nonAligned or aligned timeseries. */
public class TsFileSequenceRead {
// if you wanna print detailed datas in pages, then turn it true.
// if you wanna print detailed data in pages, then turn it true.
private static boolean printDetail = false;
public static final String POINT_IN_PAGE = "\t\tpoints in the page: ";
private static int MASK = 0x80;
Expand Down
2 changes: 1 addition & 1 deletion java/tsfile/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ Read TsFile Example

### Prerequisites

To build TsFile wirh Java, you need to have:
To build TsFile with Java, you need to have:

1. Java >= 1.8 (1.8, 11 to 17 are verified. Please make sure the environment path has been set accordingly).
2. Maven >= 3.6.3 (If you want to compile TsFile from source code).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ TIMESTAMP
* 3. Operators
*/

// Operators. Arithmetics
// Operators. Arithmetic

MINUS : '-';
PLUS : '+';
DIV : '/';
MOD : '%';


// Operators. Comparation
// Operators. Comparison

OPERATOR_DEQ : '==';
OPERATOR_SEQ : '=';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ public class TSFileConfig implements Serializable {
/** full path of kerberos keytab file. */
private String kerberosKeytabFilePath = "/path";

/** kerberos pricipal. */
/** kerberos principal. */
private String kerberosPrincipal = "principal";

/** The acceptable error rate of bloom filter. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public long getMaxByteSize() {
if (values == null) {
return 0;
}
// try to caculate max value
// try to calculate max value
int groupNum = (values.size() / 8 + 1) / 63 + 1;
return (long) 8 + groupNum * 5 + values.size() * 4;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public long getMaxByteSize() {
if (values == null) {
return 0;
}
// try to caculate max value
// try to calculate max value
return (long) 8 + values.size() * 4;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public long getMaxByteSize() {
if (values == null) {
return 0;
}
// try to caculate max value
// try to calculate max value
int groupNum = (values.size() / 8 + 1) / 63 + 1;
return (long) 8 + groupNum * 5 + values.size() * 8;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public long getMaxByteSize() {
if (values == null) {
return 0;
}
// try to caculate max value
// try to calculate max value
return (long) 8 + values.size() * 4;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ protected void endPreviousBitPackedRun(int lastBitPackedNum) {
protected void encodeValue(T value) {
if (!isBitWidthSaved) {
// save bit width in header,
// perpare for read
// prepare for read
byteCache.write(bitWidth);
isBitWidthSaved = true;
}
Expand Down Expand Up @@ -249,7 +249,7 @@ protected void encodeValue(T value) {
}

} else {
// we encounter a differnt value
// we encounter a different value
if (repeatCount >= TSFileConfig.RLE_MIN_REPEATED_NUM) {
try {
writeRleRun();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class SDTEncoder {
private int lastReadInt;
private float lastReadFloat;

// the last stored time and vlaue we compare current point against lastStoredPair
// the last stored time and value we compare current point against lastStoredPair
private long lastStoredTimestamp;

private long lastStoredLong;
Expand Down
Loading
Loading