[GitHub] carbondata pull request #2899: [CARBONDATA-3073] Support configure TableProp...

classic Classic list List threaded Threaded
85 messages Options
12345
Reply | Threaded
Open this post in threaded view
|

[GitHub] carbondata pull request #2899: [CARBONDATA-3073][CARBONDATA-3044] Support co...

qiuchenjian-2
Github user xubo245 commented on a diff in the pull request:

    https://github.com/apache/carbondata/pull/2899#discussion_r241630042
 
    --- Diff: store/CSDK/test/main.cpp ---
    @@ -645,6 +653,278 @@ bool testWriteData(JNIEnv *env, char *path, int argc, char *argv[]) {
         }
     }
     
    +void writeData(JNIEnv *env, CarbonWriter writer, int size, jclass objClass, char *stringField, short shortField) {
    +    jobjectArray arr = env->NewObjectArray(size, objClass, 0);
    +
    +    jobject jStringField = env->NewStringUTF(stringField);
    +    env->SetObjectArrayElement(arr, 0, jStringField);
    +
    +    char ctrShort[10];
    +    gcvt(shortField % 10000, 10, ctrShort);
    +    jobject jShortField = env->NewStringUTF(ctrShort);
    +    env->SetObjectArrayElement(arr, 1, jShortField);
    +
    +    writer.write(arr);
    +
    +    env->DeleteLocalRef(jStringField);
    +    env->DeleteLocalRef(jShortField);
    +    env->DeleteLocalRef(arr);
    +}
    +
    +/**
    + * test WithLoadOption interface
    + *
    + * @param env  jni env
    + * @param path file path
    + * @param argc argument counter
    + * @param argv argument vector
    + * @return true or throw exception
    + */
    +bool testWithLoadOption(JNIEnv *env, char *path, int argc, char *argv[]) {
    +
    +    char *jsonSchema = "[{stringField:string},{shortField:short},{intField:int},{longField:long},{doubleField:double},{boolField:boolean},{dateField:date},{timeField:timestamp},{floatField:float},{arrayField:array}]";
    +    try {
    +        CarbonWriter writer;
    +        writer.builder(env);
    +        writer.outputPath(path);
    +        writer.withCsvInput(jsonSchema);
    +        writer.withLoadOption("complex_delimiter_level_1", "#");
    +        writer.writtenBy("CSDK");
    +        writer.taskNo(185);
    +        writer.withThreadSafe(1);
    +        writer.uniqueIdentifier(1549911814000000);
    +        writer.withBlockSize(1);
    +        writer.withBlockletSize(16);
    +        writer.enableLocalDictionary(true);
    +        writer.localDictionaryThreshold(10000);
    +        if (argc > 3) {
    +            writer.withHadoopConf("fs.s3a.access.key", argv[1]);
    +            writer.withHadoopConf("fs.s3a.secret.key", argv[2]);
    +            writer.withHadoopConf("fs.s3a.endpoint", argv[3]);
    +        }
    +        writer.build();
    +
    +        int rowNum = 70000;
    +        int size = 10;
    +        long longValue = 0;
    +        double doubleValue = 0;
    +        float floatValue = 0;
    +        jclass objClass = env->FindClass("java/lang/String");
    +        for (int i = 0; i < rowNum; ++i) {
    +            jobjectArray arr = env->NewObjectArray(size, objClass, 0);
    +            char ctrInt[10];
    +            gcvt(i, 10, ctrInt);
    +
    +            char a[15] = "robot";
    +            strcat(a, ctrInt);
    +            jobject stringField = env->NewStringUTF(a);
    +            env->SetObjectArrayElement(arr, 0, stringField);
    +
    +            char ctrShort[10];
    +            gcvt(i % 10000, 10, ctrShort);
    +            jobject shortField = env->NewStringUTF(ctrShort);
    +            env->SetObjectArrayElement(arr, 1, shortField);
    +
    +            jobject intField = env->NewStringUTF(ctrInt);
    +            env->SetObjectArrayElement(arr, 2, intField);
    +
    +
    +            char ctrLong[10];
    +            gcvt(longValue, 10, ctrLong);
    +            longValue = longValue + 2;
    +            jobject longField = env->NewStringUTF(ctrLong);
    +            env->SetObjectArrayElement(arr, 3, longField);
    +
    +            char ctrDouble[10];
    +            gcvt(doubleValue, 10, ctrDouble);
    +            doubleValue = doubleValue + 2;
    +            jobject doubleField = env->NewStringUTF(ctrDouble);
    +            env->SetObjectArrayElement(arr, 4, doubleField);
    +
    +            jobject boolField = env->NewStringUTF("true");
    +            env->SetObjectArrayElement(arr, 5, boolField);
    +
    +            jobject dateField = env->NewStringUTF(" 2019-03-02");
    +            env->SetObjectArrayElement(arr, 6, dateField);
    +
    +            jobject timeField = env->NewStringUTF("2019-02-12 03:03:34");
    +            env->SetObjectArrayElement(arr, 7, timeField);
    +
    +            char ctrFloat[10];
    +            gcvt(floatValue, 10, ctrFloat);
    +            floatValue = floatValue + 2;
    +            jobject floatField = env->NewStringUTF(ctrFloat);
    +            env->SetObjectArrayElement(arr, 8, floatField);
    +
    +            jobject arrayField = env->NewStringUTF("Hello#World#From#Carbon");
    +            env->SetObjectArrayElement(arr, 9, arrayField);
    +
    +
    +            writer.write(arr);
    +
    +            env->DeleteLocalRef(stringField);
    +            env->DeleteLocalRef(shortField);
    +            env->DeleteLocalRef(intField);
    +            env->DeleteLocalRef(longField);
    +            env->DeleteLocalRef(doubleField);
    +            env->DeleteLocalRef(floatField);
    +            env->DeleteLocalRef(dateField);
    +            env->DeleteLocalRef(timeField);
    +            env->DeleteLocalRef(boolField);
    +            env->DeleteLocalRef(arrayField);
    +            env->DeleteLocalRef(arr);
    +        }
    +        writer.close();
    +
    +        CarbonReader carbonReader;
    +        carbonReader.builder(env, path);
    +        carbonReader.build();
    +        int i = 0;
    +        int printNum = 10;
    +        CarbonRow carbonRow(env);
    +        while (carbonReader.hasNext()) {
    +            jobject row = carbonReader.readNextRow();
    +            i++;
    +            carbonRow.setCarbonRow(row);
    +            if (i < printNum) {
    +                printf("%s\t%d\t%ld\t", carbonRow.getString(0), carbonRow.getInt(1), carbonRow.getLong(2));
    +                jobjectArray array1 = carbonRow.getArray(3);
    +                jsize length = env->GetArrayLength(array1);
    +                int j = 0;
    +                for (j = 0; j < length; j++) {
    +                    jobject element = env->GetObjectArrayElement(array1, j);
    +                    char *str = (char *) env->GetStringUTFChars((jstring) element, JNI_FALSE);
    +                    printf("%s\t", str);
    +                }
    +                printf("%d\t", carbonRow.getShort(4));
    +                printf("%d\t", carbonRow.getInt(5));
    +                printf("%ld\t", carbonRow.getLong(6));
    +                printf("%lf\t", carbonRow.getDouble(7));
    +                bool bool1 = carbonRow.getBoolean(8);
    +                if (bool1) {
    +                    printf("true\t");
    +                } else {
    +                    printf("false\t");
    +                }
    +                printf("%f\t\n", carbonRow.getFloat(9));
    +            }
    +            env->DeleteLocalRef(row);
    +        }
    +        carbonReader.close();
    +    } catch (jthrowable ex) {
    +        env->ExceptionDescribe();
    +        env->ExceptionClear();
    +    }
    +}
    +
    +/**
    +  * test WithTableProperties interface
    +  *
    +  * @param env  jni env
    +  * @param path file path
    +  * @param argc argument counter
    +  * @param argv argument vector
    +  * @return true or throw exception
    +  */
    +bool testWithTableProperty(JNIEnv *env, char *path, int argc, char **argv) {
    +
    +    char *jsonSchema = "[{stringField:string},{shortField:short}]";
    +    try {
    --- End diff --
   
    this one is better to keep. It need add random if add this to testWriteData, keep this will more simply to understand for user.


---
Reply | Threaded
Open this post in threaded view
|

[GitHub] carbondata issue #2899: [CARBONDATA-3073][CARBONDATA-3044] Support configure...

qiuchenjian-2
In reply to this post by qiuchenjian-2
Github user xubo245 commented on the issue:

    https://github.com/apache/carbondata/pull/2899
 
    @ajantha-bhat Rebased and optimized.


---
Reply | Threaded
Open this post in threaded view
|

[GitHub] carbondata issue #2899: [CARBONDATA-3073][CARBONDATA-3044] Support configure...

qiuchenjian-2
In reply to this post by qiuchenjian-2
Github user CarbonDataQA commented on the issue:

    https://github.com/apache/carbondata/pull/2899
 
    Build Failed  with Spark 2.1.0, Please check CI http://136.243.101.176:8080/job/ApacheCarbonPRBuilder2.1/1745/



---
Reply | Threaded
Open this post in threaded view
|

[GitHub] carbondata issue #2899: [CARBONDATA-3073][CARBONDATA-3044] Support configure...

qiuchenjian-2
In reply to this post by qiuchenjian-2
Github user CarbonDataQA commented on the issue:

    https://github.com/apache/carbondata/pull/2899
 
    Build Failed  with Spark 2.3.2, Please check CI http://136.243.101.176:8080/job/carbondataprbuilder2.3/10004/



---
Reply | Threaded
Open this post in threaded view
|

[GitHub] carbondata issue #2899: [CARBONDATA-3073][CARBONDATA-3044] Support configure...

qiuchenjian-2
In reply to this post by qiuchenjian-2
Github user CarbonDataQA commented on the issue:

    https://github.com/apache/carbondata/pull/2899
 
    Build Failed with Spark 2.2.1, Please check CI http://95.216.28.178:8080/job/ApacheCarbonPRBuilder1/1956/



---
Reply | Threaded
Open this post in threaded view
|

[GitHub] carbondata issue #2899: [CARBONDATA-3073][CARBONDATA-3044] Support configure...

qiuchenjian-2
In reply to this post by qiuchenjian-2
Github user CarbonDataQA commented on the issue:

    https://github.com/apache/carbondata/pull/2899
 
    Build Success with Spark 2.1.0, Please check CI http://136.243.101.176:8080/job/ApacheCarbonPRBuilder2.1/1748/



---
Reply | Threaded
Open this post in threaded view
|

[GitHub] carbondata issue #2899: [CARBONDATA-3073][CARBONDATA-3044] Support configure...

qiuchenjian-2
In reply to this post by qiuchenjian-2
Github user CarbonDataQA commented on the issue:

    https://github.com/apache/carbondata/pull/2899
 
    Build Success with Spark 2.3.2, Please check CI http://136.243.101.176:8080/job/carbondataprbuilder2.3/10007/



---
Reply | Threaded
Open this post in threaded view
|

[GitHub] carbondata issue #2899: [CARBONDATA-3073][CARBONDATA-3044] Support configure...

qiuchenjian-2
In reply to this post by qiuchenjian-2
Github user CarbonDataQA commented on the issue:

    https://github.com/apache/carbondata/pull/2899
 
    Build Failed with Spark 2.2.1, Please check CI http://95.216.28.178:8080/job/ApacheCarbonPRBuilder1/1959/



---
Reply | Threaded
Open this post in threaded view
|

[GitHub] carbondata issue #2899: [CARBONDATA-3073][CARBONDATA-3044] Support configure...

qiuchenjian-2
In reply to this post by qiuchenjian-2
Github user xubo245 commented on the issue:

    https://github.com/apache/carbondata/pull/2899
 
    retest this please


---
Reply | Threaded
Open this post in threaded view
|

[GitHub] carbondata issue #2899: [CARBONDATA-3073][CARBONDATA-3044] Support configure...

qiuchenjian-2
In reply to this post by qiuchenjian-2
Github user CarbonDataQA commented on the issue:

    https://github.com/apache/carbondata/pull/2899
 
    Build Success with Spark 2.1.0, Please check CI http://136.243.101.176:8080/job/ApacheCarbonPRBuilder2.1/1754/



---
Reply | Threaded
Open this post in threaded view
|

[GitHub] carbondata issue #2899: [CARBONDATA-3073][CARBONDATA-3044] Support configure...

qiuchenjian-2
In reply to this post by qiuchenjian-2
Github user CarbonDataQA commented on the issue:

    https://github.com/apache/carbondata/pull/2899
 
    Build Success with Spark 2.2.1, Please check CI http://95.216.28.178:8080/job/ApacheCarbonPRBuilder1/1965/



---
Reply | Threaded
Open this post in threaded view
|

[GitHub] carbondata issue #2899: [CARBONDATA-3073][CARBONDATA-3044] Support configure...

qiuchenjian-2
In reply to this post by qiuchenjian-2
Github user CarbonDataQA commented on the issue:

    https://github.com/apache/carbondata/pull/2899
 
    Build Success with Spark 2.3.2, Please check CI http://136.243.101.176:8080/job/carbondataprbuilder2.3/10013/



---
Reply | Threaded
Open this post in threaded view
|

[GitHub] carbondata issue #2899: [CARBONDATA-3073][CARBONDATA-3044] Support configure...

qiuchenjian-2
In reply to this post by qiuchenjian-2
Github user xubo245 commented on the issue:

    https://github.com/apache/carbondata/pull/2899
 
    @ajantha-bhat @KanakaKumar CI pass, Please review again


---
Reply | Threaded
Open this post in threaded view
|

[GitHub] carbondata pull request #2899: [CARBONDATA-3073][CARBONDATA-3044] Support co...

qiuchenjian-2
In reply to this post by qiuchenjian-2
Github user KanakaKumar commented on a diff in the pull request:

    https://github.com/apache/carbondata/pull/2899#discussion_r241730265
 
    --- Diff: store/CSDK/src/CarbonWriter.cpp ---
    @@ -98,6 +127,158 @@ void CarbonWriter::withHadoopConf(char *key, char *value) {
         carbonWriterBuilderObject = jniEnv->CallObjectMethodA(carbonWriterBuilderObject, methodID, args);
     }
     
    +void CarbonWriter::withTableProperty(char *key, char *value) {
    +    if (key == NULL) {
    +        throw std::runtime_error("key parameter can't be NULL.");
    +    }
    +    if (value == NULL) {
    +        throw std::runtime_error("value parameter can't be NULL.");
    +    }
    +    checkBuilder();
    +    jclass carbonWriterBuilderClass = jniEnv->GetObjectClass(carbonWriterBuilderObject);
    +    jmethodID methodID = jniEnv->GetMethodID(carbonWriterBuilderClass, "withTableProperty",
    +        "(Ljava/lang/String;Ljava/lang/String;)Lorg/apache/carbondata/sdk/file/CarbonWriterBuilder;");
    +    if (methodID == NULL) {
    +        throw std::runtime_error("Can't find the method in java: withTableProperty");
    +    }
    +    jvalue args[2];
    +    args[0].l = jniEnv->NewStringUTF(key);
    +    args[1].l = jniEnv->NewStringUTF(value);
    +    carbonWriterBuilderObject = jniEnv->CallObjectMethodA(carbonWriterBuilderObject, methodID, args);
    --- End diff --
   
    Java code may throw IllegalArgumentException for unsuported property.  We should add exception check after the method call


---
Reply | Threaded
Open this post in threaded view
|

[GitHub] carbondata pull request #2899: [CARBONDATA-3073][CARBONDATA-3044] Support co...

qiuchenjian-2
In reply to this post by qiuchenjian-2
Github user KanakaKumar commented on a diff in the pull request:

    https://github.com/apache/carbondata/pull/2899#discussion_r241731133
 
    --- Diff: store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonWriterBuilder.java ---
    @@ -77,8 +77,9 @@
     
       /**
        * Sets the output path of the writer builder
    +   *
    --- End diff --
   
    Can avoid the space changes in multiple places if not intentional.


---
Reply | Threaded
Open this post in threaded view
|

[GitHub] carbondata pull request #2899: [CARBONDATA-3073][CARBONDATA-3044] Support co...

qiuchenjian-2
In reply to this post by qiuchenjian-2
Github user xubo245 commented on a diff in the pull request:

    https://github.com/apache/carbondata/pull/2899#discussion_r241811704
 
    --- Diff: store/CSDK/src/CarbonWriter.cpp ---
    @@ -98,6 +127,158 @@ void CarbonWriter::withHadoopConf(char *key, char *value) {
         carbonWriterBuilderObject = jniEnv->CallObjectMethodA(carbonWriterBuilderObject, methodID, args);
     }
     
    +void CarbonWriter::withTableProperty(char *key, char *value) {
    +    if (key == NULL) {
    +        throw std::runtime_error("key parameter can't be NULL.");
    +    }
    +    if (value == NULL) {
    +        throw std::runtime_error("value parameter can't be NULL.");
    +    }
    +    checkBuilder();
    +    jclass carbonWriterBuilderClass = jniEnv->GetObjectClass(carbonWriterBuilderObject);
    +    jmethodID methodID = jniEnv->GetMethodID(carbonWriterBuilderClass, "withTableProperty",
    +        "(Ljava/lang/String;Ljava/lang/String;)Lorg/apache/carbondata/sdk/file/CarbonWriterBuilder;");
    +    if (methodID == NULL) {
    +        throw std::runtime_error("Can't find the method in java: withTableProperty");
    +    }
    +    jvalue args[2];
    +    args[0].l = jniEnv->NewStringUTF(key);
    +    args[1].l = jniEnv->NewStringUTF(value);
    +    carbonWriterBuilderObject = jniEnv->CallObjectMethodA(carbonWriterBuilderObject, methodID, args);
    --- End diff --
   
    ok


---
Reply | Threaded
Open this post in threaded view
|

[GitHub] carbondata pull request #2899: [CARBONDATA-3073][CARBONDATA-3044] Support co...

qiuchenjian-2
In reply to this post by qiuchenjian-2
Github user xubo245 commented on a diff in the pull request:

    https://github.com/apache/carbondata/pull/2899#discussion_r241813858
 
    --- Diff: store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonWriterBuilder.java ---
    @@ -77,8 +77,9 @@
     
       /**
        * Sets the output path of the writer builder
    +   *
    --- End diff --
   
    I think it's better for formatting the code comments/annotation


---
Reply | Threaded
Open this post in threaded view
|

[GitHub] carbondata issue #2899: [CARBONDATA-3073][CARBONDATA-3044] Support configure...

qiuchenjian-2
In reply to this post by qiuchenjian-2
Github user CarbonDataQA commented on the issue:

    https://github.com/apache/carbondata/pull/2899
 
    Build Success with Spark 2.1.0, Please check CI http://136.243.101.176:8080/job/ApacheCarbonPRBuilder2.1/1772/



---
Reply | Threaded
Open this post in threaded view
|

[GitHub] carbondata issue #2899: [CARBONDATA-3073][CARBONDATA-3044] Support configure...

qiuchenjian-2
In reply to this post by qiuchenjian-2
Github user CarbonDataQA commented on the issue:

    https://github.com/apache/carbondata/pull/2899
 
    Build Success with Spark 2.2.1, Please check CI http://95.216.28.178:8080/job/ApacheCarbonPRBuilder1/1985/



---
Reply | Threaded
Open this post in threaded view
|

[GitHub] carbondata issue #2899: [CARBONDATA-3073][CARBONDATA-3044] Support configure...

qiuchenjian-2
In reply to this post by qiuchenjian-2
Github user CarbonDataQA commented on the issue:

    https://github.com/apache/carbondata/pull/2899
 
    Build Success with Spark 2.3.2, Please check CI http://136.243.101.176:8080/job/carbondataprbuilder2.3/10032/



---
12345